From ac927c2e6a838babfb99b3d7c5b86ea362c17e5a Mon Sep 17 00:00:00 2001
From: Maverick Wong <mvrck.wong@gmail.com>
Date: Mon, 17 Jun 2024 14:54:47 +0800
Subject: [PATCH] update

---
 .../requirements.txt                          |  0
 .env                                          | 15 ++-----
 Makefile                                      |  6 +--
 docker-compose.yaml                           | 40 ++++++++++++-------
 4 files changed, 32 insertions(+), 29 deletions(-)
 rename db/airflow.db => .devcontainer/requirements.txt (100%)

diff --git a/db/airflow.db b/.devcontainer/requirements.txt
similarity index 100%
rename from db/airflow.db
rename to .devcontainer/requirements.txt
diff --git a/.env b/.env
index 474e9e1..3eae4de 100644
--- a/.env
+++ b/.env
@@ -7,8 +7,8 @@ AIRFLOW_SRC_DIR = .
 AIRFLOW_DEST_DIR = /opt/airflow
 
 # airflow credentials
-_AIRFLOW_DB_MIGRATE = 'false'
-_AIRFLOW_WWW_USER_CREATE = 'false'
+_AIRFLOW_DB_MIGRATE = 'true'
+_AIRFLOW_WWW_USER_CREATE = 'true'
 _AIRFLOW_WWW_USER_USERNAME = airflow
 _AIRFLOW_WWW_USER_PASSWORD = airflow
 
@@ -21,13 +21,4 @@ DB_NAME = airflow_db
 
 # ports
 PORT_AIRFLOW_FLOWER = 5555
-PORT_AIRFLOW_WEBSERVER = 8080
-PORT_GRAFANA = 3000
-PORT_PROMETHEUS = 9090
-PORT_STATSD_SCRAPE = 9102
-PORT_STATSD_INGEST = 9125
-
-# grafana credentials
-GF_SECURITY_ADMIN_USER = grafana
-GF_SECURITY_ADMIN_PASSWORD = grafana
-GF_USERS_ALLOW_SIGN_UP = true
\ No newline at end of file
+PORT_AIRFLOW_WEBSERVER = 65505
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 51b17a0..abf9286 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-run_airflow:
+run_airflow_init:
 	docker compose -f "docker-compose.yaml" down
 	docker compose -f "docker-compose.yaml" up -d --build --profile init up
 
@@ -6,8 +6,8 @@ run_airflow_debug:
 	docker compose -f "docker-compose.yaml" down
 	docker compose -f "docker-compose.yaml" up -d --build --profile debug up
 
-run_airflow_users:
-	docker compose -f "docker-compose.users.yaml" down
+run_airflow:
+	docker compose -f "docker-compose.yaml" down
 	docker compose -f "docker-compose.yaml" up -d --build
 
 reload_reqs:
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 250fb69..2e9392f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -46,7 +46,7 @@
 ---
 
 version: '3.8'
-name: 'datapipeline-prod'
+name: 'airflow-dev'
 
 x-airflow-common:
   &airflow-common
@@ -67,8 +67,8 @@ x-airflow-common:
     AIRFLOW__CELERY__BROKER_URL: redis://:@redis:6379/0
     
     AIRFLOW__CORE__FERNET_KEY: ''
-    AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION: 'true'
-    AIRFLOW__CORE__LOAD_EXAMPLES: 'true'
+    AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION: 'false'
+    AIRFLOW__CORE__LOAD_EXAMPLES: 'false'
     AIRFLOW__API__AUTH_BACKENDS: 'airflow.api.auth.backend.basic_auth,airflow.api.auth.backend.session'
     AIRFLOW__SCHEDULER__ENABLE_HEALTH_CHECK: 'true'
 
@@ -90,6 +90,7 @@ x-airflow-common:
 
 services:
   redis:
+    container_name: redis
     image: redis:latest
     expose:
       - 6379
@@ -101,11 +102,13 @@ services:
       start_period: 30s
     restart: always
 
+
   airflow-webserver:
     <<: *airflow-common
+    container_name: webserver
     command: ["webserver"]
     ports:
-      - "${PORT_AIRFLOW_WEBSERVER:-8080}:8080"
+      - "${PORT_AIRFLOW_WEBSERVER}:8080"
     healthcheck:
       test: ["CMD", "curl", "--fail", "http://localhost:8080/health"]
       interval: 30s
@@ -115,11 +118,11 @@ services:
     restart: always
     depends_on:
       <<: *airflow-common-depends-on
-      airflow-init:
-        condition: service_completed_successfully
+
 
   airflow-scheduler:
     <<: *airflow-common
+    container_name: scheduler
     command: ["scheduler"]
     healthcheck:
       test: ["CMD", "curl", "--fail", "http://localhost:8974/health"]
@@ -130,8 +133,8 @@ services:
     restart: always
     depends_on:
       <<: *airflow-common-depends-on
-      airflow-init:
-        condition: service_completed_successfully
+      airflow-webserver:
+        condition: service_healthy
 
   airflow-worker:
     <<: *airflow-common
@@ -153,8 +156,9 @@ services:
     restart: always
     depends_on:
       <<: *airflow-common-depends-on
-      airflow-init:
-        condition: service_completed_successfully
+      airflow-webserver:
+        condition: service_healthy
+
 
   airflow-triggerer:
     <<: *airflow-common
@@ -168,11 +172,13 @@ services:
     restart: always
     depends_on:
       <<: *airflow-common-depends-on
-      airflow-init:
-        condition: service_completed_successfully
+      airflow-webserver:
+        condition: service_healthy
+
 
   airflow-init:
     <<: *airflow-common
+    container_name: init
     entrypoint: /bin/bash
     # yamllint disable rule:line-length
     command:
@@ -246,11 +252,15 @@ services:
       _AIRFLOW_WWW_USER_PASSWORD: ${_AIRFLOW_WWW_USER_PASSWORD:-airflow}
       _PIP_ADDITIONAL_REQUIREMENTS: ''
     user: "0:0"
+    profiles:
+      - init
     volumes:
       - ${AIRFLOW_PROJ_DIR:-.}:/sources
 
+
   airflow-cli:
     <<: *airflow-common
+    container_name: cli
     profiles:
       - debug
     environment:
@@ -261,10 +271,12 @@ services:
       - -c
       - airflow
 
+
   # You can enable flower by adding "--profile flower" option e.g. docker-compose --profile flower up
   # or by explicitly targeted on the command line e.g. docker-compose up flower.
   airflow-flower:
     <<: *airflow-common
+    container_name: flower
     command: celery flower
     profiles:
       - debug
@@ -279,5 +291,5 @@ services:
     restart: always
     depends_on:
       <<: *airflow-common-depends-on
-      airflow-init:
-        condition: service_completed_successfully
\ No newline at end of file
+      airflow-webserver:
+        condition: service_healthy
\ No newline at end of file