This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
osmith gerrit-no-reply at lists.osmocom.orgosmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/18552 ) Change subject: make/Makefile: add DISTRO, DOCKER_TAG arguments ...................................................................... make/Makefile: add DISTRO, DOCKER_TAG arguments Prepare to build osmo-*-master for multiple distributions by passing a DISTRO argument. Add DOCKER_TAG, so we don't tag images for both debian and centos as "latest". The next commits will make use of the new arguments. While at it, do a cosmetic tweak to the "docker build" line. Related: OS#4564 Change-Id: I1bf1c46295035a073e440faea3696ce53e7d7985 --- M make/Makefile 1 file changed, 13 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/52/18552/1 diff --git a/make/Makefile b/make/Makefile index b10c665..dfc7605 100644 --- a/make/Makefile +++ b/make/Makefile @@ -32,6 +32,8 @@ OSMO_SIP_BRANCH?=master OSMO_STP_BRANCH?=master PULL?= +DOCKER_TAG?=latest +DISTRO?=debian-stretch RELEASE_SUPPORT := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))/.make-release-support IMAGE?=$(REGISTRY_HOST)/$(USER)/$(NAME) @@ -55,7 +57,11 @@ docker-build: .release - docker build --build-arg USER=$(USERNAME) --build-arg OSMO_TTCN3_BRANCH=$(OSMO_TTCN3_BRANCH) \ + docker build \ + --build-arg USER=$(USERNAME) \ + --build-arg DISTRO=$(DISTRO) \ + --build-arg DOCKER_TAG=$(DOCKER_TAG) \ + --build-arg OSMO_TTCN3_BRANCH=$(OSMO_TTCN3_BRANCH) \ --build-arg OSMO_BB_BRANCH=$(OSMO_BB_BRANCH) \ --build-arg OSMO_BSC_BRANCH=$(OSMO_BSC_BRANCH) \ --build-arg OSMO_BTS_BRANCH=$(OSMO_BTS_BRANCH) \ @@ -70,17 +76,17 @@ --build-arg OSMO_SGSN_BRANCH=$(OSMO_SGSN_BRANCH) \ --build-arg OSMO_SIP_BRANCH=$(OSMO_SIP_BRANCH) \ --build-arg OSMO_STP_BRANCH=$(OSMO_STP_BRANCH) \ - $(PULL) -t $(IMAGE):latest . + $(PULL) -t $(IMAGE):$(DOCKER_TAG) . @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) ; \ tag: docker-build if [ $$DOCKER_MAJOR -eq 1 ] && [ $$DOCKER_MINOR -lt 10 ] ; then \ - echo docker tag -f $(IMAGE):latest $(IMAGE):$(VERSION) ;\ - docker tag -f $(IMAGE):latest $(IMAGE):$(VERSION) ;\ + echo docker tag -f $(IMAGE):$(DOCKER_TAG) $(IMAGE):$(VERSION) ;\ + docker tag -f $(IMAGE):$(DOCKER_TAG) $(IMAGE):$(VERSION) ;\ else \ - echo docker tag $(IMAGE):latest $(IMAGE):$(VERSION) ;\ - docker tag $(IMAGE):latest $(IMAGE):$(VERSION) ; \ + echo docker tag $(IMAGE):$(DOCKER_TAG) $(IMAGE):$(VERSION) ;\ + docker tag $(IMAGE):$(DOCKER_TAG) $(IMAGE):$(VERSION) ; \ fi .release: @@ -95,7 +101,7 @@ push: do-push post-push do-push: - docker push $(IMAGE):latest + docker push $(IMAGE):$(DOCKER_TAG) [ -f .release ] && docker push $(IMAGE):$(VERSION) snapshot: build push -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/18552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1bf1c46295035a073e440faea3696ce53e7d7985 Gerrit-Change-Number: 18552 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200528/7cff1697/attachment.htm>