aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@osmocom.org>2020-11-18 21:32:58 +0100
committerHarald Welte <laforge@osmocom.org>2020-11-18 21:32:58 +0100
commitc0b1c1bd74d3d8a9b354ed9e8d2e7e8d735d6679 (patch)
treed4505c2f3de00e1cbb032c07ff0744143014950f
parent8368c2b9730635be72e6c357efb77d86b12667ff (diff)
HACK: podmanlaforge/podman
-rw-r--r--make/Makefile19
1 files changed, 6 insertions, 13 deletions
diff --git a/make/Makefile b/make/Makefile
index 1a13c4d..bbd951b 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -57,7 +57,7 @@ post-push:
docker-build: .release
- docker build \
+ podman build \
--build-arg USER=$(USERNAME) \
--build-arg REGISTRY=$(REGISTRY_HOST) \
--build-arg OSMO_TTCN3_BRANCH=$(OSMO_TTCN3_BRANCH) \
@@ -78,17 +78,10 @@ docker-build: .release
--build-arg OSMO_SIP_BRANCH=$(OSMO_SIP_BRANCH) \
--build-arg OSMO_STP_BRANCH=$(OSMO_STP_BRANCH) \
$(PULL) -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) ; \
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) ;\
- else \
- echo docker tag $(IMAGE):latest $(IMAGE):$(VERSION) ;\
- docker tag $(IMAGE):latest $(IMAGE):$(VERSION) ; \
- fi
+ echo podman tag $(IMAGE):latest $(IMAGE):$(VERSION) ;\
+ podman tag $(IMAGE):latest $(IMAGE):$(VERSION) ; \
.release:
@echo "release=0.0.0" > .release
@@ -102,8 +95,8 @@ release: build push
push: do-push post-push
do-push:
- docker push $(IMAGE):latest
- [ -f .release ] && docker push $(IMAGE):$(VERSION)
+ podman push $(IMAGE):latest
+ [ -f .release ] && podman push $(IMAGE):$(VERSION)
snapshot: build push
@@ -130,4 +123,4 @@ major-release: tag-major-release release
run:
- docker run $(RUN_ARGS) -it $(IMAGE)
+ podman run $(RUN_ARGS) -it $(IMAGE)