diff --git a/Dockerfile b/Dockerfile index 8bd47b3..0bc8e59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /app COPY . /app # Install dependencies -RUN pip install --no-cache-dir -r requirements.txt --verbose +RUN pip install --no-cache-dir -r requirements.txt # Expose port 5000 for the Flask app EXPOSE 5000 diff --git a/app/config.py b/app/config.py index 85ded3a..a5609ac 100644 --- a/app/config.py +++ b/app/config.py @@ -3,9 +3,6 @@ import os class Config: """Base configuration for Flask app""" - # SQLALCHEMY_DATABASE_URI = "mysql://root:password@localhost/flask_app" - # SQLALCHEMY_TRACK_MODIFICATIONS = False - # SECRET_KEY = os.environ.get("SECRET_KEY", "your_secret_key") SWAGGER_URL = os.getenv("SWAGGER_URL", "/documentation") API_URL = os.getenv("API_URL", "/swagger.json") @@ -23,7 +20,6 @@ class Config: DATABASE_NAME = os.environ.get("DATABASE_NAME") SQLALCHEMY_DATABASE_URI = ( - # f"postgresql+psycopg2://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}" - f"postgresql+psycopg2://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}" + f"postgresql+psycopg2://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}" ) SQLALCHEMY_TRACK_MODIFICATIONS = False \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 7841806..aca41e0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,34 +1,12 @@ services: - db: - image: postgres:13 - environment: - - POSTGRES_USER=${DATABASE_USER} - - POSTGRES_PASSWORD=${DATABASE_PASSWORD} - - POSTGRES_DB=${DATABASE_NAME} - ports: - - "${DATABASE_PORT}:${DATABASE_PORT}" - volumes: - - postgres_data:/var/lib/postgresql/data - healthcheck: - test: ["CMD-SHELL", "pg_isready -U ${DATABASE_USER} -d ${DATABASE_NAME}"] - interval: 5s - timeout: 5s - retries: 5 - digifi-bank-to-product-core: build: . ports: - "${APP_PORT:-4500}:5000" environment: - - FLASK_APP=wsgi.py - - FLASK_ENV=development - - DATABASE_URL=postgresql+psycopg2://${DATABASE_USER}:${DATABASE_PASSWORD}@db:${DATABASE_PORT}/${DATABASE_NAME} + - FLASK_APP=${FLASK_APP} + - FLASK_ENV=${FLASK_ENV} + - DATABASE_URL=postgresql+psycopg2://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME} volumes: - .:/app - depends_on: - db: - condition: service_healthy - restart: always - -volumes: - postgres_data: \ No newline at end of file + restart: always \ No newline at end of file