diff --git a/.env b/.env index 05e6c88..4f39066 100644 --- a/.env +++ b/.env @@ -1,3 +1,4 @@ +APP_PORT=14700 FLASK_APP=project/__init__.py FLASK_DEBUG=1 SOCKET_URL=https://dev-socket.mermsemr.com diff --git a/.env.dev b/.env.dev index 05e6c88..4f39066 100644 --- a/.env.dev +++ b/.env.dev @@ -1,3 +1,4 @@ +APP_PORT=14700 FLASK_APP=project/__init__.py FLASK_DEBUG=1 SOCKET_URL=https://dev-socket.mermsemr.com diff --git a/.env.production b/.env.production new file mode 100644 index 0000000..9aff276 --- /dev/null +++ b/.env.production @@ -0,0 +1,16 @@ +APP_PORT=14700 +FLASK_APP=project/__init__.py +FLASK_DEBUG=1 +SOCKET_URL=https://socket.mermsemr.com +PANEL_URL=https://panel.mermsemr.com +DATABASE_URL=postgresql://merms_panel:merms_panel@10.20.30.60:5432/merms_panel +SQL_HOST=10.20.30.60 +SQL_PORT=5432 +DATABASE=postgres +APP_FOLDER=/usr/src/app +INITIAL_PRODUCT_URL=devprov.mermsemr.com +MAIL_SERVER=smtp.gmail.com +MAIL_PORT= 465 +MAIL_USERNAME=message@chiefsoft.com +MAIL_PASSWORD=may12002! +JWT_SECRET=dce6bd64f7d7101de4fed7cfc1 \ No newline at end of file diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 7b48941..e641ca3 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -1,37 +1,12 @@ -version: '2.2' +version: '3.8' services: - web: - build: - context: ./services/web - dockerfile: Dockerfile.prod - command: gunicorn --bind 0.0.0.0:5000 manage:app + mermsemr-core: + build: ./services/web + command: python manage.py run -h 0.0.0.0 volumes: - - static_volume:/home/app/web/project/static - - media_volume:/home/app/web/project/media - expose: - - 5000 - env_file: - - ./.env.prod - depends_on: - - db - db: - image: postgres:13 - volumes: - - postgres_data_prod:/var/lib/postgresql/data/ - env_file: - - ./.env.prod.db - nginx: - build: ./services/nginx - volumes: - - static_volume:/home/app/web/project/static - - media_volume:/home/app/web/project/media + - ./services/web/:/usr/src/app/ ports: - - 1337:80 - depends_on: - - web - -volumes: - postgres_data_prod: - static_volume: - media_volume: + - "${APP_PORT:-14700}:5000" + env_file: + - ./.env.production \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 5bbcce7..b4bd7d4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,25 +1,22 @@ version: '3.8' services: - web: + mermsemr-core: build: ./services/web command: python manage.py run -h 0.0.0.0 volumes: - ./services/web/:/usr/src/app/ ports: - - 5001:5000 + - "${APP_PORT:-14700}:5000" env_file: - ./.env.dev -# depends_on: -# - db -# db: -# image: postgres:13 -# volumes: -# - postgres_data:/var/lib/postgresql/data/ -# environment: -# - POSTGRES_USER=hello_flask -# - POSTGRES_PASSWORD=hello_flask -# - POSTGRES_DB=hello_flask_dev -volumes: - postgres_data: \ No newline at end of file +#volumes: +# postgres_data: +# +#networks: +# default: +# driver: bridge +# ipam: +# config: +# - subnet: 172.16.55.0/24 \ No newline at end of file