From 334d3b1ef3a1148147454c4d935ebaf4b741e498 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Fri, 19 Jun 2020 12:54:02 +0200 Subject: CI: force registry:2.6 For using the `registry:2.6` image. 2.7 and beyond dropped the `htpasswd` binary from the rootfs which parts of our CI depends on. While this is not a sustainable solution (assuming `htpasswd` is gone for ever), it unblocks the CI for now. Signed-off-by: Valentin Rothberg --- hack/podman-registry | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'hack/podman-registry') diff --git a/hack/podman-registry b/hack/podman-registry index fe79b7d9d..6ccc59655 100755 --- a/hack/podman-registry +++ b/hack/podman-registry @@ -7,7 +7,7 @@ ME=$(basename $0) ############################################################################### # BEGIN defaults -PODMAN_REGISTRY_IMAGE=docker.io/library/registry:2 +PODMAN_REGISTRY_IMAGE=docker.io/library/registry:2.6 PODMAN_REGISTRY_USER= PODMAN_REGISTRY_PASS= @@ -30,7 +30,7 @@ into a local temporary directory, create an htpasswd, start the registry, and dump a series of environment variables to stdout: \$ $ME start - PODMAN_REGISTRY_IMAGE=\"docker.io/library/registry:2\" + PODMAN_REGISTRY_IMAGE=\"docker.io/library/registry:2.6\" PODMAN_REGISTRY_PORT=\"5050\" PODMAN_REGISTRY_USER=\"userZ3RZ\" PODMAN_REGISTRY_PASS=\"T8JVJzKrcl4p6uT\" @@ -201,7 +201,7 @@ function do_start() { -e "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd" \ -e "REGISTRY_HTTP_TLS_CERTIFICATE=/auth/domain.crt" \ -e "REGISTRY_HTTP_TLS_KEY=/auth/domain.key" \ - registry:2 + registry:2.6 # Dump settings. Our caller will use these to access the registry. for v in IMAGE PORT USER PASS; do -- cgit v1.2.3-54-g00ecf