From d685ceefd8f06e45ec9eb30a18c9c695404ff9ce Mon Sep 17 00:00:00 2001 From: Simon Dalvai Date: Mon, 17 Jun 2024 13:53:12 +0200 Subject: [PATCH] infra: use default docker compose files --- pollution_v2/docker-compose.yaml | 2 -- .../infrastructure/docker-compose.build.yml | 2 -- .../infrastructure/docker-compose.run.yml | 15 +-------------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/pollution_v2/docker-compose.yaml b/pollution_v2/docker-compose.yaml index 0508aef..390068c 100644 --- a/pollution_v2/docker-compose.yaml +++ b/pollution_v2/docker-compose.yaml @@ -47,8 +47,6 @@ # Default: '' # # Feel free to modify this file to suit your needs. -version: "3.7" - x-airflow-common: &airflow-common diff --git a/pollution_v2/infrastructure/docker-compose.build.yml b/pollution_v2/infrastructure/docker-compose.build.yml index 88efc4f..d5a65a9 100644 --- a/pollution_v2/infrastructure/docker-compose.build.yml +++ b/pollution_v2/infrastructure/docker-compose.build.yml @@ -1,5 +1,3 @@ -version: "3.7" - services: app: image: ${DOCKER_IMAGE}:${DOCKER_TAG} diff --git a/pollution_v2/infrastructure/docker-compose.run.yml b/pollution_v2/infrastructure/docker-compose.run.yml index 7058e32..d675442 100644 --- a/pollution_v2/infrastructure/docker-compose.run.yml +++ b/pollution_v2/infrastructure/docker-compose.run.yml @@ -47,8 +47,7 @@ x-airflow-common: # AIRFLOW__CORE__MAX_ACTIVE_TASKS_PER_DAG: 4 NO_PROXY: '*' volumes: - - ${AIRFLOW_PROJ_DIR:-.}/src:/opt/airflow/dags - - ${AIRFLOW_PROJ_DIR:-.}/airflow/logs:/opt/airflow/logs + - pollution-logs:/opt/airflow/logs user: "${AIRFLOW_UID:-50000}:0" depends_on: &airflow-common-depends-on @@ -58,18 +57,6 @@ x-airflow-common: condition: service_healthy services: - x-airflow-common: - &airflow-common - volumes: - - pollution-logs:/opt/airflow/logs - user: "${AIRFLOW_UID:-50000}:0" - depends_on: - &airflow-common-depends-on - redis: - condition: service_healthy - postgres: - condition: service_healthy - postgres: image: postgres:13 environment: