Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Iss 003 docker context refactor #197

Merged
merged 4 commits into from
Aug 18, 2024
Merged

Iss 003 docker context refactor #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fca1832
Refactored airflow docker files into new org and tested.
MattTriano Aug 18, 2024
c7daa14
Refactors superset container files to new org.
MattTriano Aug 18, 2024
f1e0f1f
Refactors remaining container files into new org.
MattTriano Aug 18, 2024
8b2cffa
Removing an obsolete Dockerfile.
MattTriano Aug 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions Dockerfiles/python.Dockerfile
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions Dockerfiles/superset.Dockerfile
View file
Open in desktop

This file was deleted.

32 changes: 16 additions & 16 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/airflow.Dockerfile → docker/airflow/airflow.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
0 Dockerfiles/airflow_db.Dockerfile → docker/airflow/airflow_db.Dockerfile
View file
Open in desktop
File renamed without changes.
0 requirements/airflow_requirements.txt → docker/airflow/requirements.txt
View file
Open in desktop
File renamed without changes.
0 Dockerfiles/dbt.Dockerfile → docker/dbt/dbt.Dockerfile
View file
Open in desktop
File renamed without changes.
0 Dockerfiles/pgadmin4.Dockerfile → docker/pgadmin/pgadmin4.Dockerfile
View file
Open in desktop
File renamed without changes.
0 Dockerfiles/postgis.Dockerfile → docker/postgis/postgis.Dockerfile
View file
Open in desktop
File renamed without changes.
0 Dockerfiles/redis.Dockerfile → docker/redis/redis.Dockerfile
View file
Open in desktop
File renamed without changes.
0 requirements/superset/docker-bootstrap.sh → docker/superset/docker-bootstrap.sh
View file
Open in desktop
File renamed without changes.
0 requirements/superset/docker-init.sh → docker/superset/docker-init.sh
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions docker/superset/postgres.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FROM postgres:14.5
0 ...uperset/pythonpath_dev/superset_config.py → ...uperset/pythonpath_dev/superset_config.py
View file
Open in desktop
File renamed without changes.
0 ...ements/superset/superset_requirements.txt → docker/superset/requirements.txt
View file
Open in desktop
File renamed without changes.
10 changes: 10 additions & 0 deletions docker/superset/superset.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading