From 52fb7ec2cb8ae4631c8489f1d0f7d7bd987b20a5 Mon Sep 17 00:00:00 2001
From: Valentin Matton <taq@protonmail.ch>
Date: Wed, 4 Oct 2023 17:43:54 +0200
Subject: [PATCH] chore: cleanup

---
 deployment/docker-compose.yml         |  9 +--------
 deployment/modules/stack_data/main.tf |  2 +-
 docker-compose.yml                    | 15 +++++----------
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
index db4564453..23e407d48 100644
--- a/deployment/docker-compose.yml
+++ b/deployment/docker-compose.yml
@@ -5,8 +5,6 @@ name: "data-inclusion"
 
 x-airflow-common:
   &airflow-common
-  build:
-    context: ../pipeline
 
   environment:
     &airflow-common-environment
@@ -42,9 +40,6 @@ x-airflow-common:
 
   volumes:
     - airflow-logs:/opt/airflow/logs
-    - ../pipeline/dbt:/opt/airflow/dbt:ro
-    - ../pipeline/dags:/opt/airflow/dags:ro
-    - ../pipeline/src:/opt/airflow/data-inclusion/src:ro
 
   depends_on:
     &airflow-common-depends-on
@@ -77,9 +72,7 @@ services:
 
   airflow-webserver:
     <<: *airflow-common
-    image: data-inclusion/pipeline
-    build:
-      context: pipeline
+    image: apache/airflow:2.7.0-python3.10
     command: webserver
     restart: always
     healthcheck:
diff --git a/deployment/modules/stack_data/main.tf b/deployment/modules/stack_data/main.tf
index 632b1040e..9796d0232 100644
--- a/deployment/modules/stack_data/main.tf
+++ b/deployment/modules/stack_data/main.tf
@@ -147,7 +147,7 @@ resource "null_resource" "up" {
   provisioner "remote-exec" {
     inline = [
       "rm -rf ${local.work_dir}",
-      "mkdir -p ${local.work_dir}/deployment ${local.work_dir}/pipeline",
+      "mkdir -p ${local.work_dir}/deployment",
     ]
   }
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 9386b42a1..e9fcc8f42 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,8 +2,6 @@ version: "3"
 
 x-airflow-common:
   &airflow-common
-  build:
-    context: pipeline
 
   environment:
     &airflow-common-environment
@@ -119,6 +117,7 @@ services:
 
   airflow-webserver:
     <<: *airflow-common
+    image: apache/airflow:2.7.0-python3.10
     command: webserver
     restart: on-failure
     ports:
@@ -130,6 +129,9 @@ services:
 
   airflow-scheduler:
     <<: *airflow-common
+    image: data-inclusion/pipeline
+    build:
+      context: pipeline
     command: scheduler
     restart: on-failure
     healthcheck:
@@ -148,6 +150,7 @@ services:
 
   airflow-init:
     <<: *airflow-common
+    image: apache/airflow:2.7.0-python3.10
     entrypoint: /bin/bash -c
     user: 0:0
     command:
@@ -163,14 +166,6 @@ services:
       _AIRFLOW_WWW_USER_USERNAME: airflow
       _AIRFLOW_WWW_USER_PASSWORD: airflow
 
-  dbt-init:
-    image: ghcr.io/dbt-labs/dbt-postgres:1.4.1
-    command: deps
-    environment:
-      DBT_PROFILES_DIR: /usr/app
-    volumes:
-      - ./pipeline/dbt:/usr/app
-
   minio:
     image: minio/minio:RELEASE.2022-10-08T20-11-00Z
     command: server /data