Commit Graph

11 Commits

Author SHA1 Message Date
Harald Welte 4648003d0f Makefile: Fix default naming of images
This got broken in Change-Id If2e3cc7693ce5e7c1c95d2f81e302c72bb4230be

Change-Id: I97f9eb3f203301ebc2315ff38216d5b4502eb3d2
2018-06-03 17:17:58 +00:00
Harald Welte c400005f38 Makefile: get rid of entire git tagging logic
Change-Id: Idaa55b636031afd214853ccfcf6c9e3b097050b1
2018-06-03 15:54:34 +00:00
Harald Welte 9e631757be Makefile: Don't use "-dirty" logic when tagging docker images
Change-Id: Ie44144f25fd5f801ceeed904f6d19521b333ed0d
2018-06-03 15:54:34 +00:00
Harald Welte 9b94c793be Makefile: Only push a tag if there is a .release file
Change-Id: I73b2ed5794c75d09b166bc65ac79b9cbe3764ad4
2018-06-03 15:54:34 +00:00
Harald Welte a2e28ef91f Makefile: Allow override of REGISTRY/USERNAME/NAME/IMAGE
Change-Id: If2e3cc7693ce5e7c1c95d2f81e302c72bb4230be
2018-06-03 15:54:34 +00:00
Alexander Couzens 5910de0394 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
2018-04-12 09:20:34 +00:00
Neels Hofmeyr 2f1b669e2f fix 'make -C subdir': use $(CURDIR) instead of $PWD
$(PWD) reflects the dir of 'make' invocation, $(CURDIR) the dir stepped into.
So obtain the current dir from $(CURDIR) instead of $(PWD).

So far, when doing 'make -C osmo-foo-maser', the image's name would be derived
from the root dir's basename and all images were tagged as 'docker-playground'.
With this fix, 'make -C' from anywhere still tags with the proper name.

Change-Id: I1dd0fd1ad89fdee18fdbea851ccc831ad60aeccf
2018-04-05 03:15:23 +02:00
Harald Welte 6bce1e644f Makefiles: Don't tag images with versions by default
Tagging each build with a version means we have to clean up lots of
images manually.  Let's change this to:
* "make build" aka "make docker-build" only builds as $name:latest
* "make docker-tag" will tag $name:latest as $name:$version

This is racey, but then we don't really need version tags for the images
so far anyway.
2017-10-15 14:45:03 +00:00
Harald Welte 58343d6c87 Makefile: Fix 'make run' to use correct image name 2017-08-19 20:18:59 +02:00
Harald Welte 4bda77175e Introduce 'make run' to run the respective container 2017-08-19 19:51:35 +02:00
Harald Welte fc0fec7941 Import Makefile from https://github.com/mvanholsteijn/docker-makefile
upstream git version is 190313ea54af7d175dd3469a39a95654d068b83e
2017-08-19 19:31:49 +02:00