From 9e1c8c1bbbeb0db4e549be0cbace0b6c562c3bf2 Mon Sep 17 00:00:00 2001
From: Renaud Gaubert <rgaubert@nvidia.com>
Date: Tue, 22 Oct 2019 16:11:35 -0700
Subject: [PATCH] Rename images

Signed-off-by: Renaud Gaubert <rgaubert@nvidia.com>
---
 Makefile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 77922022..034446ac 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ DIST_DIR       := $(CURDIR)/dist
 all: ubuntu18.04 ubuntu16.04 debian10 debian9 centos7 amzn2 amzn1 opensuse-leap15.1
 
 push%:
-	docker push "$(REGISTRY)/ubuntu:$*"
+	docker push "$(REGISTRY)/$*"
 
 ubuntu%: ARCH := amd64
 ubuntu%:
@@ -23,10 +23,10 @@ ubuntu%:
 		--build-arg VERSION_ID="$*" \
 		--build-arg PKG_VERS="$(VERSION)" \
 		--build-arg PKG_REV="1" \
-		--tag "$(REGISTRY)/ubuntu:$*" \
+		--tag "$(REGISTRY)/ubuntu$*" \
 		--file docker/Dockerfile.ubuntu .
 	$(MKDIR) -p $(DIST_DIR)/$@/$(ARCH)
-	$(DOCKER) run --cidfile $@.cid "$(REGISTRY)/ubuntu:$*"
+	$(DOCKER) run --cidfile $@.cid "$(REGISTRY)/ubuntu$*"
 	$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/$@/$(ARCH)/
 	$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
 
@@ -37,10 +37,10 @@ debian%:
 		--build-arg VERSION_ID="$*" \
 		--build-arg PKG_VERS="$(VERSION)" \
 		--build-arg PKG_REV="1" \
-		--tag "$(REGISTRY)/debian:$*" \
+		--tag "$(REGISTRY)/debian$*" \
 		--file docker/Dockerfile.debian .
 	$(MKDIR) -p $(DIST_DIR)/$@/$(ARCH)
-	$(DOCKER) run --cidfile $@.cid "$(REGISTRY)/debian:$*"
+	$(DOCKER) run --cidfile $@.cid "$(REGISTRY)/debian$*"
 	$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/$@/$(ARCH)/
 	$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
 
@@ -51,10 +51,10 @@ centos%:
 		--build-arg VERSION_ID="$*" \
 		--build-arg PKG_VERS="$(VERSION)" \
 		--build-arg PKG_REV="2" \
-		--tag "$(REGISTRY)/centos:$*" \
+		--tag "$(REGISTRY)/centos$*" \
 		--file docker/Dockerfile.centos .
 	$(MKDIR) -p $(DIST_DIR)/$@/$(ARCH)
-	$(DOCKER) run --cidfile $@.cid "$(REGISTRY)/centos:$*"
+	$(DOCKER) run --cidfile $@.cid "$(REGISTRY)/centos$*"
 	$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/$@/$(ARCH)/
 	$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
 
@@ -65,10 +65,10 @@ amzn%:
 		--build-arg VERSION_ID="$*" \
 		--build-arg PKG_VERS="$(VERSION)" \
 		--build-arg PKG_REV="2.amzn$*" \
-		--tag "$(REGISTRY)/amzn:$*" \
+		--tag "$(REGISTRY)/amzn$*" \
 		--file docker/Dockerfile.amzn .
 	$(MKDIR) -p $(DIST_DIR)/$@/$(ARCH)
-	$(DOCKER) run --cidfile $@.cid "$(REGISTRY)/amzn:$*"
+	$(DOCKER) run --cidfile $@.cid "$(REGISTRY)/amzn$*"
 	$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/$@/$(ARCH)/
 	$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
 
@@ -79,9 +79,9 @@ opensuse-leap%:
 		--build-arg VERSION_ID="$*" \
 		--build-arg PKG_VERS="$(VERSION)" \
 		--build-arg PKG_REV="1" \
-		--tag "$(REGISTRY)/opensuse-leap:$*" \
+		--tag "$(REGISTRY)/opensuse-leap$*" \
 		--file docker/Dockerfile.opensuse-leap .
 	$(MKDIR) -p $(DIST_DIR)/$@/$(ARCH)
-	$(DOCKER) run --cidfile $@.cid "$(REGISTRY)/opensuse-leap:$*"
+	$(DOCKER) run --cidfile $@.cid "$(REGISTRY)/opensuse-leap$*"
 	$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/$@/$(ARCH)/
 	$(DOCKER) rm $$(cat $@.cid) && rm $@.cid