Merge pull request #313 from mjlshen/OSD-24357

Fix MCVW builds on RHEL8

Author: openshift-merge-bot[bot]

Makefile

@@ -146,36 +146,27 @@ container-test:
 			make test
 
 ### Imported
-.PHONY: skopeo-push
-skopeo-push:
+.PHONY: container-image-push 
+container-image-push:
 	@if [[ -z $$QUAY_USER || -z $$QUAY_TOKEN ]]; then \
 		echo "You must set QUAY_USER and QUAY_TOKEN environment variables" ;\
 		echo "ex: make QUAY_USER=value QUAY_TOKEN=value $@" ;\
 		exit 1 ;\
 	fi
-	# QUAY_USER and QUAY_TOKEN are supplied as env vars
-	skopeo copy --dest-creds "${QUAY_USER}:${QUAY_TOKEN}" \
-		"docker-daemon:${IMG}:${IMAGETAG}" \
-		"docker://${IMG}:latest"
-	skopeo copy --dest-creds "${QUAY_USER}:${QUAY_TOKEN}" \
-		"docker-daemon:${IMG}:${IMAGETAG}" \
-		"docker://${IMG}:${IMAGETAG}"
-
-.PHONY: skopeo-push-package
-skopeo-push-package:
+	$(CONTAINER_ENGINE) login -u="${QUAY_USER}" -p="${QUAY_TOKEN}" quay.io
+	$(CONTAINER_ENGINE) push "${IMG}:${IMAGETAG}"
+	$(CONTAINER_ENGINE) push "${IMG}:latest"
+
+.PHONY: package-push
+package-push:
 	@if [[ -z $$QUAY_USER || -z $$QUAY_TOKEN ]]; then \
 		echo "You must set QUAY_USER and QUAY_TOKEN environment variables" ;\
 		echo "ex: make QUAY_USER=value QUAY_TOKEN=value $@" ;\
 		exit 1 ;\
 	fi
-	# QUAY_USER and QUAY_TOKEN are supplied as env vars
-	skopeo copy --dest-creds "${QUAY_USER}:${QUAY_TOKEN}" \
-		"docker-daemon:${PKG_IMG}:${IMAGETAG}" \
-		"docker://${PKG_IMG}:latest"
-	skopeo copy --dest-creds "${QUAY_USER}:${QUAY_TOKEN}" \
-		"docker-daemon:${PKG_IMG}:${IMAGETAG}" \
-		"docker://${PKG_IMG}:${IMAGETAG}"
-
+	$(CONTAINER_ENGINE) login -u="${QUAY_USER}" -p="${QUAY_TOKEN}" quay.io
+	$(CONTAINER_ENGINE) push "${PKG_IMG}:${IMAGETAG}"
+	$(CONTAINER_ENGINE) push "${PKG_IMG}:latest"
 
 .PHONY: push-base
 push-base: build/Dockerfile

build/build_push.sh

@@ -90,4 +90,4 @@ if image_exists_in_repo "$IMAGE_URI"; then
 fi
 
 # build the image, the selectorsyncset, and push the image
-make -C $(dirname $0)/../ syncset build-base skopeo-push
+make -C $(dirname $0)/../ syncset build-base container-image-push

build/build_push_package.sh

@@ -90,4 +90,4 @@ if image_exists_in_repo "$IMAGE_URI"; then
 fi
 
 # build the image, the selectorsyncset, and push the image
-make -C $(dirname $0)/../ package build-base skopeo-push-package
+make -C $(dirname $0)/../ package build-base package-push