Skip to content

Commit d11572e

Browse files
committed
Update push steps to use containerized skopeo
Signed-off-by: Michael Shen <mshen@redhat.com>
1 parent 94bae11 commit d11572e

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

boilerplate/openshift/custom-catalog-osd-operator/custom-catalog-build-push.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CONTAINER_ENGINE=$(command -v podman || command -v docker)
77
CONTAINER_ENGINE_SHORT=${CONTAINER_ENGINE##*/}
88
REPO_ROOT=$(git rev-parse --show-toplevel)
99
VERSIONS_DIR=${REPO_ROOT}/versions
10-
SKOPEO_IMAGE="quay.io/skopeo/stable:v1.8.0"
10+
SKOPEO_IMAGE="quay.io/skopeo/stable:v1.14.2"
1111

1212
source $REPO_ROOT/boilerplate/_lib/common.sh
1313

boilerplate/openshift/golang-osd-operator/csv-generate/catalog-publish.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ popd
9595

9696
if [ "$push_catalog" = true ] ; then
9797
# push image
98-
skopeo copy --dest-creds "${QUAY_USER}:${QUAY_TOKEN}" \
98+
${CONTAINER_ENGINE} run ${SKOPEO_IMAGE} -- skopeo copy --dest-creds "${QUAY_USER}:${QUAY_TOKEN}" \
9999
"${SRC_CONTAINER_TRANSPORT}:${registry_image}:${operator_channel}-latest" \
100100
"docker://${registry_image}:${operator_channel}-latest"
101101

@@ -104,7 +104,7 @@ if [ "$push_catalog" = true ] ; then
104104
exit 1
105105
fi
106106

107-
skopeo copy --dest-creds "${QUAY_USER}:${QUAY_TOKEN}" \
107+
${CONTAINER_ENGINE} run ${SKOPEO_IMAGE} -- skopeo copy --dest-creds "${QUAY_USER}:${QUAY_TOKEN}" \
108108
"${SRC_CONTAINER_TRANSPORT}:${registry_image}:${operator_channel}-latest" \
109109
"docker://${registry_image}:${operator_channel}-${operator_commit_hash}"
110110

boilerplate/openshift/golang-osd-operator/csv-generate/common.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
REPO_ROOT=$(git rev-parse --show-toplevel)
44
source $REPO_ROOT/boilerplate/_lib/common.sh
5+
SKOPEO_IMAGE="quay.io/skopeo/stable:v1.14.2"
56

67
function check_mandatory_params() {
78
local csv_missing_param_error

0 commit comments

Comments
 (0)