diff --git a/.env b/.env index 789ff86..6f1b8ad 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ FLASK_APP=project/__init__.py FLASK_DEBUG=1 -DATABASE_URL=postgresql://hello_flask:hello_flask@db:5432/hello_flask_dev -SQL_HOST=db +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 \ No newline at end of file diff --git a/.env.dev-sample b/.env.dev-sample index 396ab02..c5ffe0a 100644 --- a/.env.dev-sample +++ b/.env.dev-sample @@ -5,3 +5,13 @@ SQL_HOST=db SQL_PORT=5432 DATABASE=postgres APP_FOLDER=/usr/src/app + + +FLASK_APP=project/__init__.py +FLASK_DEBUG=1 +DATABASE_URL=postgresql://hello_flask:hello_flask@db:5432/hello_flask_dev +SQL_HOST=db +SQL_PORT=5432 +DATABASE=postgres +APP_FOLDER=/usr/src/app + diff --git a/docker-compose.yml b/docker-compose.yml index a357095..5bbcce7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,16 +10,16 @@ services: - 5001: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 +# 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