Skip to content

Commit

Permalink
bug-1884404: Fix docker-compose config for Docker Compose v2.24.6 (#983)
Browse files Browse the repository at this point in the history
  • Loading branch information
relud committed Mar 8, 2024
1 parent a61d0cb commit 412f898
Showing 1 changed file with 18 additions and 4 deletions.
22 changes: 18 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
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

0 comments on commit 412f898

Please sign in to comment.