diff --git a/DockerFile b/DockerFile deleted file mode 100644 index 0fe6c11..0000000 --- a/DockerFile +++ /dev/null @@ -1,15 +0,0 @@ -FROM python:3.8 - -RUN pip install --upgrade pip setuptools \ - && ./packages.sh - -ADD chat /app/chat -ADD generalApp /app/generalApp -ADD TradeApp /app/TradeApp -ADD manage.py /app/manage.py - -WORKDIR /app - -RUN ./migrate.sh - -CMD ["./run.sh"] diff --git a/Dockerfile b/Dockerfile index 00975bf..3bb1dc6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,17 @@ FROM python:3.8 -FROM redis -RUN python -m venv venv -RUN source venv/bin/activate +RUN pip install --upgrade pip setuptools -CMD ["mkdir", "application"] -WORKDIR /application - -RUN git clone git@github.com:TBS093A/trade-app-backend.git +ADD chat ./chat +ADD generalApp ./generalApp +ADD TradeApp ./TradeApp +ADD manage.py ./manage.py +ADD packages.sh ./packages.sh +ADD migrate.sh ./migrate.sh +ADD run.sh ./run.sh RUN ./packages.sh RUN ./migrate.sh -RUN ./run.sh \ No newline at end of file + +# CMD ["gunicorn", "-w", "4", "-b", "0.0.0.0:8000", "TradeApp.wsgi"] +CMD ["python", "manage.py", "runserver", "0.0.0.0:9090"] diff --git a/TradeApp/__pycache__/__init__.cpython-38.pyc b/TradeApp/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..60bef0d Binary files /dev/null and b/TradeApp/__pycache__/__init__.cpython-38.pyc differ diff --git a/TradeApp/__pycache__/routing.cpython-38.pyc b/TradeApp/__pycache__/routing.cpython-38.pyc new file mode 100644 index 0000000..98af8a1 Binary files /dev/null and b/TradeApp/__pycache__/routing.cpython-38.pyc differ diff --git a/TradeApp/__pycache__/settings.cpython-38.pyc b/TradeApp/__pycache__/settings.cpython-38.pyc new file mode 100644 index 0000000..a618616 Binary files /dev/null and b/TradeApp/__pycache__/settings.cpython-38.pyc differ diff --git a/TradeApp/__pycache__/urls.cpython-38.pyc b/TradeApp/__pycache__/urls.cpython-38.pyc new file mode 100644 index 0000000..2cdb744 Binary files /dev/null and b/TradeApp/__pycache__/urls.cpython-38.pyc differ diff --git a/chat/__pycache__/__init__.cpython-38.pyc b/chat/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..1c71bde Binary files /dev/null and b/chat/__pycache__/__init__.cpython-38.pyc differ diff --git a/chat/__pycache__/admin.cpython-38.pyc b/chat/__pycache__/admin.cpython-38.pyc new file mode 100644 index 0000000..a52da00 Binary files /dev/null and b/chat/__pycache__/admin.cpython-38.pyc differ diff --git a/chat/__pycache__/consumers.cpython-38.pyc b/chat/__pycache__/consumers.cpython-38.pyc new file mode 100644 index 0000000..6e4029e Binary files /dev/null and b/chat/__pycache__/consumers.cpython-38.pyc differ diff --git a/chat/__pycache__/models.cpython-38.pyc b/chat/__pycache__/models.cpython-38.pyc new file mode 100644 index 0000000..9feff6a Binary files /dev/null and b/chat/__pycache__/models.cpython-38.pyc differ diff --git a/chat/__pycache__/routing.cpython-38.pyc b/chat/__pycache__/routing.cpython-38.pyc new file mode 100644 index 0000000..16c3ae0 Binary files /dev/null and b/chat/__pycache__/routing.cpython-38.pyc differ diff --git a/chat/__pycache__/urls.cpython-38.pyc b/chat/__pycache__/urls.cpython-38.pyc new file mode 100644 index 0000000..39b66bf Binary files /dev/null and b/chat/__pycache__/urls.cpython-38.pyc differ diff --git a/chat/__pycache__/views.cpython-38.pyc b/chat/__pycache__/views.cpython-38.pyc new file mode 100644 index 0000000..49c1caf Binary files /dev/null and b/chat/__pycache__/views.cpython-38.pyc differ diff --git a/chat/migrations/__pycache__/0001_initial.cpython-38.pyc b/chat/migrations/__pycache__/0001_initial.cpython-38.pyc new file mode 100644 index 0000000..f2a472a Binary files /dev/null and b/chat/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/chat/migrations/__pycache__/__init__.cpython-38.pyc b/chat/migrations/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..4af0d3d Binary files /dev/null and b/chat/migrations/__pycache__/__init__.cpython-38.pyc differ diff --git a/generalApp/__pycache__/AbstractCRUD.cpython-38.pyc b/generalApp/__pycache__/AbstractCRUD.cpython-38.pyc new file mode 100644 index 0000000..0381bbc Binary files /dev/null and b/generalApp/__pycache__/AbstractCRUD.cpython-38.pyc differ diff --git a/generalApp/__pycache__/__init__.cpython-38.pyc b/generalApp/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..99322ed Binary files /dev/null and b/generalApp/__pycache__/__init__.cpython-38.pyc differ diff --git a/generalApp/__pycache__/admin.cpython-38.pyc b/generalApp/__pycache__/admin.cpython-38.pyc new file mode 100644 index 0000000..fe79e92 Binary files /dev/null and b/generalApp/__pycache__/admin.cpython-38.pyc differ diff --git a/generalApp/__pycache__/exchangeVO.cpython-38.pyc b/generalApp/__pycache__/exchangeVO.cpython-38.pyc new file mode 100644 index 0000000..5c7967b Binary files /dev/null and b/generalApp/__pycache__/exchangeVO.cpython-38.pyc differ diff --git a/generalApp/__pycache__/methods.cpython-38.pyc b/generalApp/__pycache__/methods.cpython-38.pyc new file mode 100644 index 0000000..1af82a6 Binary files /dev/null and b/generalApp/__pycache__/methods.cpython-38.pyc differ diff --git a/generalApp/__pycache__/models.cpython-38.pyc b/generalApp/__pycache__/models.cpython-38.pyc new file mode 100644 index 0000000..318c53b Binary files /dev/null and b/generalApp/__pycache__/models.cpython-38.pyc differ diff --git a/generalApp/__pycache__/urls.cpython-38.pyc b/generalApp/__pycache__/urls.cpython-38.pyc new file mode 100644 index 0000000..e656342 Binary files /dev/null and b/generalApp/__pycache__/urls.cpython-38.pyc differ diff --git a/generalApp/__pycache__/utilities.cpython-38.pyc b/generalApp/__pycache__/utilities.cpython-38.pyc new file mode 100644 index 0000000..38061f4 Binary files /dev/null and b/generalApp/__pycache__/utilities.cpython-38.pyc differ diff --git a/generalApp/__pycache__/views.cpython-38.pyc b/generalApp/__pycache__/views.cpython-38.pyc new file mode 100644 index 0000000..a1f6a85 Binary files /dev/null and b/generalApp/__pycache__/views.cpython-38.pyc differ diff --git a/generalApp/migrations/__pycache__/0001_initial.cpython-38.pyc b/generalApp/migrations/__pycache__/0001_initial.cpython-38.pyc new file mode 100644 index 0000000..7a3c7c6 Binary files /dev/null and b/generalApp/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/generalApp/migrations/__pycache__/0002_triggers_status.cpython-38.pyc b/generalApp/migrations/__pycache__/0002_triggers_status.cpython-38.pyc new file mode 100644 index 0000000..f405f7f Binary files /dev/null and b/generalApp/migrations/__pycache__/0002_triggers_status.cpython-38.pyc differ diff --git a/generalApp/migrations/__pycache__/0003_auto_20191229_1407.cpython-38.pyc b/generalApp/migrations/__pycache__/0003_auto_20191229_1407.cpython-38.pyc new file mode 100644 index 0000000..84b838e Binary files /dev/null and b/generalApp/migrations/__pycache__/0003_auto_20191229_1407.cpython-38.pyc differ diff --git a/generalApp/migrations/__pycache__/0004_notifications.cpython-38.pyc b/generalApp/migrations/__pycache__/0004_notifications.cpython-38.pyc new file mode 100644 index 0000000..1542c3c Binary files /dev/null and b/generalApp/migrations/__pycache__/0004_notifications.cpython-38.pyc differ diff --git a/generalApp/migrations/__pycache__/0005_users_avatar.cpython-38.pyc b/generalApp/migrations/__pycache__/0005_users_avatar.cpython-38.pyc new file mode 100644 index 0000000..777a561 Binary files /dev/null and b/generalApp/migrations/__pycache__/0005_users_avatar.cpython-38.pyc differ diff --git a/generalApp/migrations/__pycache__/0006_auto_20200113_2147.cpython-38.pyc b/generalApp/migrations/__pycache__/0006_auto_20200113_2147.cpython-38.pyc new file mode 100644 index 0000000..ba2bba5 Binary files /dev/null and b/generalApp/migrations/__pycache__/0006_auto_20200113_2147.cpython-38.pyc differ diff --git a/generalApp/migrations/__pycache__/0007_auto_20200115_1743.cpython-38.pyc b/generalApp/migrations/__pycache__/0007_auto_20200115_1743.cpython-38.pyc new file mode 100644 index 0000000..71fe5d3 Binary files /dev/null and b/generalApp/migrations/__pycache__/0007_auto_20200115_1743.cpython-38.pyc differ diff --git a/generalApp/migrations/__pycache__/__init__.cpython-38.pyc b/generalApp/migrations/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..52d3549 Binary files /dev/null and b/generalApp/migrations/__pycache__/__init__.cpython-38.pyc differ diff --git a/migrate.sh b/migrate.sh index dd743e0..8af65c8 100755 --- a/migrate.sh +++ b/migrate.sh @@ -1,4 +1,4 @@ -python manage.py makemigrations +# python manage.py makemigrations python manage.py migrate # python manage.py graph_models -a -g -o class_diagram_by_apps.png -# python manage.py graph_models -a -o class_diagram.png \ No newline at end of file +# python manage.py graph_models -a -o class_diagram.png diff --git a/packages.sh b/packages.sh index 1af26a1..3bc154e 100755 --- a/packages.sh +++ b/packages.sh @@ -4,11 +4,11 @@ pip install django-cors-headers==3.5.0 pip install channels_redis==3.1.0 pip install requests==2.24.0 pip install pyjwt==1.7.1 - +pip install gunicorn==20.0.4 # for runing generate UML: # pip install pydotplus # pip install django_extensions -# apt-get install graphviz \ No newline at end of file +# apt-get install graphviz