Update push steps to use containerized skopeo

Signed-off-by: Michael Shen <mshen@redhat.com>
openshift · Mar 29, 2024 · a506d20 · a506d20
1 parent 94bae11
commit a506d20
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/boilerplate/openshift/custom-catalog-osd-operator/custom-catalog-build-push.sh b/boilerplate/openshift/custom-catalog-osd-operator/custom-catalog-build-push.sh
@@ -7,7 +7,7 @@ CONTAINER_ENGINE=$(command -v podman || command -v docker)
 CONTAINER_ENGINE_SHORT=${CONTAINER_ENGINE##*/}
 REPO_ROOT=$(git rev-parse --show-toplevel)
 VERSIONS_DIR=${REPO_ROOT}/versions
-SKOPEO_IMAGE="quay.io/skopeo/stable:v1.8.0"
+SKOPEO_IMAGE="quay.io/skopeo/stable:v1.14.2"
 
 source $REPO_ROOT/boilerplate/_lib/common.sh
 

diff --git a/boilerplate/openshift/golang-osd-operator/csv-generate/catalog-publish.sh b/boilerplate/openshift/golang-osd-operator/csv-generate/catalog-publish.sh
@@ -95,7 +95,7 @@ popd
 
 if [ "$push_catalog" = true ] ; then
     # push image
-    skopeo copy --dest-creds "${QUAY_USER}:${QUAY_TOKEN}" \
+    ${CONTAINER_ENGINE} run ${SKOPEO_IMAGE} -- skopeo copy --dest-creds "${QUAY_USER}:${QUAY_TOKEN}" \
         "${SRC_CONTAINER_TRANSPORT}:${registry_image}:${operator_channel}-latest" \
         "docker://${registry_image}:${operator_channel}-latest"
 
@@ -104,7 +104,7 @@ if [ "$push_catalog" = true ] ; then
         exit 1
     fi
 
-    skopeo copy --dest-creds "${QUAY_USER}:${QUAY_TOKEN}" \
+    ${CONTAINER_ENGINE} run ${SKOPEO_IMAGE} -- skopeo copy --dest-creds "${QUAY_USER}:${QUAY_TOKEN}" \
         "${SRC_CONTAINER_TRANSPORT}:${registry_image}:${operator_channel}-latest" \
         "docker://${registry_image}:${operator_channel}-${operator_commit_hash}"
 

diff --git a/boilerplate/openshift/golang-osd-operator/csv-generate/common.sh b/boilerplate/openshift/golang-osd-operator/csv-generate/common.sh
@@ -2,6 +2,7 @@
 
 REPO_ROOT=$(git rev-parse --show-toplevel)
 source $REPO_ROOT/boilerplate/_lib/common.sh
+SKOPEO_IMAGE="quay.io/skopeo/stable:v1.14.2"
 
 function check_mandatory_params() {
     local csv_missing_param_error

diff --git a/config/app-sre-build-push.sh b/config/app-sre-build-push.sh
@@ -16,6 +16,7 @@ quay_image=$registry/$namespace/$name
 
 HERE=$(realpath ${0%/*})
 container_engine=${CONTAINER_ENGINE:-$(command -v podman || echo docker)}
+SKOPEO_IMAGE="quay.io/skopeo/stable:v1.14.2"
 
 build_cumulative() {
     local tag=$1
@@ -26,7 +27,7 @@ build_cumulative() {
 push_for_tag() {
     local tag=$1
     echo "Pushing for tag $tag"
-    skopeo copy --dest-creds "${QUAY_USER}:${QUAY_TOKEN}" \
+    ${container_engine} run ${SKOPEO_IMAGE} -- skopeo copy --dest-creds "${QUAY_USER}:${QUAY_TOKEN}" \
         "docker-daemon:${name}:$tag" \
         "docker://${quay_image}:$tag"
 }