diff --git a/IMG_SFX b/IMG_SFX index 38e7d457..843999c7 100644 --- a/IMG_SFX +++ b/IMG_SFX @@ -1 +1 @@ -20250627t155202z-f42f41d13 +20250721t181111z-f42f41d13 diff --git a/cache_images/fedora_packaging.sh b/cache_images/fedora_packaging.sh index 28d9460f..fe8b8936 100644 --- a/cache_images/fedora_packaging.sh +++ b/cache_images/fedora_packaging.sh @@ -56,6 +56,7 @@ INSTALL_PACKAGES=(\ curl device-mapper-devel dnsmasq + docker-distribution e2fsprogs-devel emacs-nox fakeroot diff --git a/skopeo_cidev/Containerfile b/skopeo_cidev/Containerfile index 7fbc1d2a..183fd0c7 100644 --- a/skopeo_cidev/Containerfile +++ b/skopeo_cidev/Containerfile @@ -12,7 +12,6 @@ RUN dnf -y update && \ dnf clean all ENV REG_REPO="https://github.com/docker/distribution.git" \ - REG_COMMIT="b5ca020cfbe998e5af3457fda087444cf5116496" \ REG_COMMIT_SCHEMA1="ec87e9b6971d831f0eff752ddb54fb64693e51cd" \ OSO_REPO="https://github.com/openshift/origin.git" \ OSO_TAG="v1.5.0-alpha.3" diff --git a/skopeo_cidev/setup.sh b/skopeo_cidev/setup.sh index 93be0a60..4b736724 100644 --- a/skopeo_cidev/setup.sh +++ b/skopeo_cidev/setup.sh @@ -9,7 +9,6 @@ set -e declare -a req_vars req_vars=(\ REG_REPO - REG_COMMIT REG_COMMIT_SCHEMA1 OSO_REPO OSO_TAG @@ -43,12 +42,6 @@ cd "$REG_GOSRC" ( # This is required to be set like this by the build system export GOPATH="$PWD/Godeps/_workspace:$GOPATH" - # This comes in from the Containerfile - # shellcheck disable=SC2154 - git checkout -q "$REG_COMMIT" - go build -o /usr/local/bin/registry-v2 \ - github.com/docker/distribution/cmd/registry - # This comes in from the Containerfile # shellcheck disable=SC2154 git checkout -q "$REG_COMMIT_SCHEMA1"