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

Fix/move docker profiles to dev #674

Merged
merged 2 commits into from
Mar 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ test:
cd e2e; POSTGRES_PASSWORD=$(POSTGRES_PASSWORD) APPS_FQDN=$(APPS_FQDN) cargo test $(CARGO_TEST_FLAGS) -- --nocapture

# Start the containers locally. This does not start panamax by default,
# to start panamax locally run this command with the COMPOSE_PROFILES=panamax
# environment variable.
# to start panamax locally run this command with an override for the profiles:
# `make COMPOSE_PROFILES=panamax up`
up: docker-compose.rendered.yml
CONTAINER_REGISTRY=$(CONTAINER_REGISTRY) $(DOCKER_COMPOSE) -f $< -p $(STACK) up -d $(DOCKER_COMPOSE_FLAGS)

Expand Down
6 changes: 6 additions & 0 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,9 @@ services:
exec /usr/local/bin/service "$${@:0}"
ports:
- 5000:8000
panamax:
profiles:
- panamax
deck-chores:
profiles:
- panamax
4 changes: 0 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@ services:
constraints:
- node.hostname==controller
panamax:
profiles:
- panamax
image: "${CONTAINER_REGISTRY}/panamax:${PANAMAX_TAG}"
restart: always
networks:
Expand All @@ -191,8 +189,6 @@ services:
constraints:
- node.hostname==controller
deck-chores:
profiles:
- panamax
image: funkyfuture/deck-chores:1
restart: unless-stopped
environment:
Expand Down