Merge pull request #197 from MattTriano/iss_003_docker_context_refactor

Iss 003 docker context refactor
MattTriano · Aug 18, 2024 · 19a7868 · 19a7868
2 parents 9008f0c + 8b2cffa
commit 19a7868
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 35 deletions.
diff --git a/Dockerfiles/python.Dockerfile b/Dockerfiles/python.Dockerfile
diff --git a/Dockerfiles/superset.Dockerfile b/Dockerfiles/superset.Dockerfile
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,8 +2,8 @@ version: "3.9"
 
 x-airflow-common: &airflow-common
   build:
-    context: ./
-    dockerfile: ./Dockerfiles/airflow.Dockerfile
+    context: ./docker/airflow
+    dockerfile: airflow.Dockerfile
   env_file:
     - .env
   environment: &airflow-common-env
@@ -33,8 +33,8 @@ x-airflow-common: &airflow-common
 
 x-superset-common: &superset-common
   build:
-    context: ./
-    dockerfile: Dockerfiles/superset.Dockerfile
+    context: ./docker/superset
+    dockerfile: superset.Dockerfile
   networks:
     - re_etl_net
   env_file:
@@ -68,8 +68,8 @@ services:
   ss_db:
     image: adwh_ss_db:14.5
     build:
-      context: ./
-      dockerfile: Dockerfiles/airflow_db.Dockerfile
+      context: ./docker/superset
+      dockerfile: postgres.Dockerfile
     env_file:
       - .env.superset
     networks:
@@ -102,8 +102,8 @@ services:
   redis:
     image: adwh_redis:7.0.8
     build:
-      context: ./
-      dockerfile: Dockerfiles/redis.Dockerfile
+      context: ./docker/redis
+      dockerfile: redis.Dockerfile
     ports:
       - "6379:6379"
     volumes:
@@ -120,8 +120,8 @@ services:
   airflow_db:
     image: adwh_airflow_pg_db:14.5
     build:
-      context: ./
-      dockerfile: Dockerfiles/airflow_db.Dockerfile
+      context: ./docker/airflow
+      dockerfile: airflow_db.Dockerfile
     shm_size: 4gb
     env_file:
       - .env
@@ -148,8 +148,8 @@ services:
   dwh_db:
     image: adwh_dwh_postgis_db:15.3.3
     build:
-      context: ./
-      dockerfile: Dockerfiles/postgis.Dockerfile
+      context: ./docker/postgis
+      dockerfile: postgis.Dockerfile
     shm_size: 4gb
     env_file:
       - .env.dwh
@@ -178,8 +178,8 @@ services:
   db_admin:
     image: adwh_pgadmin:7.7
     build:
-      context: ./
-      dockerfile: ./Dockerfiles/pgadmin4.Dockerfile
+      context: ./docker/pgadmin
+      dockerfile: pgadmin4.Dockerfile
     env_file:
       - .env
     restart: always
@@ -195,8 +195,8 @@ services:
   dbt_proj:
     image: adwh_dbt:1.6.3
     build:
-      context: ./
-      dockerfile: ./Dockerfiles/dbt.Dockerfile
+      context: ./docker/dbt
+      dockerfile: dbt.Dockerfile
     env_file:
       - .env
     stdin_open: true

diff --git a/Dockerfiles/airflow.Dockerfile → docker/airflow/airflow.Dockerfile b/Dockerfiles/airflow.Dockerfile → docker/airflow/airflow.Dockerfile
@@ -11,6 +11,6 @@ RUN apt-get update \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 USER airflow
-COPY requirements/airflow_requirements.txt /requirements.txt
+COPY requirements.txt /requirements.txt
 RUN pip install --upgrade pip
 RUN pip install -v --no-cache-dir -r /requirements.txt
diff --git a/Dockerfiles/airflow_db.Dockerfile → docker/airflow/airflow_db.Dockerfile b/Dockerfiles/airflow_db.Dockerfile → docker/airflow/airflow_db.Dockerfile
diff --git a/requirements/airflow_requirements.txt → docker/airflow/requirements.txt b/requirements/airflow_requirements.txt → docker/airflow/requirements.txt
diff --git a/Dockerfiles/dbt.Dockerfile → docker/dbt/dbt.Dockerfile b/Dockerfiles/dbt.Dockerfile → docker/dbt/dbt.Dockerfile
diff --git a/Dockerfiles/pgadmin4.Dockerfile → docker/pgadmin/pgadmin4.Dockerfile b/Dockerfiles/pgadmin4.Dockerfile → docker/pgadmin/pgadmin4.Dockerfile
diff --git a/Dockerfiles/postgis.Dockerfile → docker/postgis/postgis.Dockerfile b/Dockerfiles/postgis.Dockerfile → docker/postgis/postgis.Dockerfile
diff --git a/Dockerfiles/redis.Dockerfile → docker/redis/redis.Dockerfile b/Dockerfiles/redis.Dockerfile → docker/redis/redis.Dockerfile
diff --git a/requirements/superset/docker-bootstrap.sh → docker/superset/docker-bootstrap.sh b/requirements/superset/docker-bootstrap.sh → docker/superset/docker-bootstrap.sh
diff --git a/requirements/superset/docker-init.sh → docker/superset/docker-init.sh b/requirements/superset/docker-init.sh → docker/superset/docker-init.sh
diff --git a/docker/superset/postgres.Dockerfile b/docker/superset/postgres.Dockerfile
@@ -0,0 +1 @@
+FROM postgres:14.5
diff --git a/...uperset/pythonpath_dev/superset_config.py → ...uperset/pythonpath_dev/superset_config.py b/...uperset/pythonpath_dev/superset_config.py → ...uperset/pythonpath_dev/superset_config.py
diff --git a/...ements/superset/superset_requirements.txt → docker/superset/requirements.txt b/...ements/superset/superset_requirements.txt → docker/superset/requirements.txt
diff --git a/docker/superset/superset.Dockerfile b/docker/superset/superset.Dockerfile
@@ -0,0 +1,10 @@
+FROM apache/superset:2.1.0
+
+COPY docker-init.sh /app/docker/docker-init.sh
+COPY pythonpath_dev /app/docker/pythonpath_dev
+COPY docker-bootstrap.sh /app/docker/docker-bootstrap.sh
+COPY requirements.txt /app/docker/requirements.txt
+
+USER root
+RUN pip install -v --no-cache -r /app/docker/requirements.txt
+USER superset