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

Refactor Makefiles to support $DOCKER_USER through all docker build targets #755

Merged
merged 2 commits into from
May 13, 2019

Conversation

jamesbrink
Copy link
Contributor

These changes add the ability to run custom builds using the $DOCKER_USER variables starting at the prebuilder stage, while retaining original functionality of course.

For example

DOCKER_USER='james.brink' make docker-prebuilder docker-builder docker-deps docker-intermediate

Fix invalid build argument for Makefile target docker-intermediate,
the build arg 'intermediate' was being used instead of 'builder'.
This only fails when using the 'DOCKER_USER' variable with the build
as there is a default build argument in the Dockerfile.intermediate.
Add docker-prebuilder target to primary Makefile
Add docker build args for 'prebuilder' to builder Makefile target
@CLAassistant
Copy link

CLAassistant commented May 13, 2019

CLA assistant check
All committers have signed the CLA.

@jamesbrink jamesbrink changed the title Makefile changes to support $DOCKER_USER through all stages Refactor Makefiles to support $DOCKER_USER through all docker build targets May 13, 2019
Copy link
Contributor

@fisx fisx left a comment

Choose a reason for hiding this comment

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

... and this fixes an obvious bug. Thanks!

@fisx fisx merged commit df9bb22 into wireapp:develop May 13, 2019
@jschaul jschaul mentioned this pull request May 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants