diff options
| author | Alexander Couzens <lynxis@fe80.eu> | 2018-03-27 18:04:47 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-04-12 09:20:34 +0000 |
| commit | 5910de0394958d161c5e0f876c8fdde4be55c82d (patch) | |
| tree | 7402b1f72f0a1d66e5980fcf6c70824ae52fa24c /make | |
| parent | a80e410fc53d7b88182ac9dce2e0d049b84f6b1b (diff) | |
Makefile: use $USER/image when depending on a generated image
Te make scripts will generate docker images like
"$username/foobar-test". When depending on an previous image,
the $username must match or the build will about with image not found.
Change-Id: Ied42c3e1de9a2ffaca22ba4cd02e6a398e48e97d
Diffstat (limited to 'make')
| -rw-r--r-- | make/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/make/Makefile b/make/Makefile index 21614a8..f492d60 100644 --- a/make/Makefile +++ b/make/Makefile @@ -40,7 +40,7 @@ post-push: docker-build: .release - docker build -t $(IMAGE):latest . + docker build --build-arg USER=$(USERNAME) -t $(IMAGE):latest . @DOCKER_MAJOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f1) ; \ DOCKER_MINOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f2) ; \ |