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.

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

bug-1884404: Fix docker-compose config for Docker Compose v2.24.6 #983

Merged
merged 1 commit into from
Mar 8, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 18 additions & 4 deletions docker-compose.yml
Expand Up @@ -36,15 +36,24 @@ services:
- .:/app

devcontainer:
extends:
service: test
build:
dockerfile: .devcontainer/Dockerfile
args:
userid: ${USE_UID:-10001}
groupid: ${USE_GID:-10001}
image: local/antenna-devcontainer
entrypoint: ["sleep", "inf"]
env_file:
- docker/config/local_dev.env
- docker/config/test.env
links:
- fakesentry
- gcs-emulator
- localstack
- pubsub
- statsd
volumes:
- .:/app

# Container that we use in CI--it can't volume mount things
ci:
Expand All @@ -62,14 +71,19 @@ services:

# like web but CI can't volume mount things
ci-web:
extends:
service: ci
image: local/antenna_deploy_base
env_file:
# exclude docker/config/test.env because this will be used for systemtest
# which requires store and publish to actually happen
- docker/config/local_dev.env
- my.env
command: web
links:
- fakesentry
- gcs-emulator
- localstack
- pubsub
- statsd

# Web container is a prod-like fully-functioning Antenna container
web:
Expand Down