From c0b1c1bd74d3d8a9b354ed9e8d2e7e8d735d6679 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@osmocom.org>
Date: Wed, 18 Nov 2020 21:32:58 +0100
Subject: HACK: podman

Change-Id: Ib3c8811644e6fa2c0d2880fd2ca11dc31b0bc9a9
---
 make/Makefile | 19 ++++++-------------
 1 file 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)
-- 
cgit v1.2.3