Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into prod
Browse files Browse the repository at this point in the history
  • Loading branch information
Henry Lee committed Sep 14, 2024
2 parents 4892f8c + 6071034 commit c4ffbbc
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 13 deletions.
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,6 @@ For development/testing:
# Build the local dev/test image
make build-dev
# Create the Airflow DB volume during the first setup
docker volume create --name=airflow-db-volume
# Start dev/test services
make deploy-dev
Expand Down
6 changes: 1 addition & 5 deletions docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ x-docker-common: &docker-common
context: .
dockerfile: Dockerfile.test
volumes:
- airflow-db-volume:/opt/airflow/
- ./airflow.db:/opt/airflow/airflow.db
# you can comment out the following line if you don't have service-account.json
- ./service-account.json:/opt/airflow/service-account.json
restart: unless-stopped
Expand All @@ -30,7 +30,3 @@ services:
depends_on:
- airflow
command: scheduler

volumes:
airflow-db-volume:
external: true
6 changes: 1 addition & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ x-docker-common: &docker-common
image: asia-east1-docker.pkg.dev/pycontw-225217/data-team/pycon-etl:latest
volumes:
- ./service-account.json:/opt/airflow/service-account.json
- airflow-db-volume:/opt/airflow/
- ./airflow.db:/opt/airflow/airflow.db
restart: unless-stopped
logging:
driver: json-file
Expand All @@ -26,7 +26,3 @@ services:
depends_on:
- airflow
command: scheduler

volumes:
airflow-db-volume:
external: true

0 comments on commit c4ffbbc

Please sign in to comment.