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

Add docker-compose extra flags param in Makefile #446

Merged
merged 2 commits into from
Nov 1, 2022
Merged

Add docker-compose extra flags param in Makefile #446

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c29e609
Add docker-compose extra flags param
brokad Oct 31, 2022
f3b81d0
rename to avoid confusion
brokad Nov 1, 2022
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ postgres:
$(POSTGRES_EXTRA_PATH)

docker-compose.rendered.yml: docker-compose.yml docker-compose.dev.yml
$(DOCKER_COMPOSE_ENV) $(DOCKER_COMPOSE) $(DOCKER_COMPOSE_FILES) -p $(STACK) config > $@
$(DOCKER_COMPOSE_ENV) $(DOCKER_COMPOSE) $(DOCKER_COMPOSE_FILES) $(DOCKER_COMPOSE_FLAGS) -p $(STACK) config > $@
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I might be overlooking where we are setting DOCKER_COMPOSE_FLAGS? 🙈 Ie how do we use this change?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh no no we're not using it otherwise, but it lets you add flags to this via setting the env variable from outside.

This is useful to me so I can tweak deployments further when I roll them out locally (with a docker-compose.local.yml of sorts) 😄


deploy: docker-compose.yml
$(DOCKER_COMPOSE_ENV) docker stack deploy -c $< $(STACK)
Expand Down