diff options
| -rwxr-xr-x | hack/podman-registry | 6 | ||||
| -rw-r--r-- | test/e2e/config_amd64.go | 2 | ||||
| -rw-r--r-- | test/e2e/login_logout_test.go | 6 | ||||
| -rw-r--r-- | test/endpoint/config.go | 2 | ||||
| -rw-r--r-- | test/system/150-login.bats | 10 |
5 files changed, 13 insertions, 13 deletions
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 diff --git a/test/e2e/config_amd64.go b/test/e2e/config_amd64.go index 01aa8445a..7e5765ac7 100644 --- a/test/e2e/config_amd64.go +++ b/test/e2e/config_amd64.go @@ -8,6 +8,6 @@ var ( CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry, infra, labels, healthcheck} nginx = "quay.io/libpod/alpine_nginx:latest" BB_GLIBC = "docker.io/library/busybox:glibc" - registry = "docker.io/library/registry:2" + registry = "docker.io/library/registry:2.6" labels = "quay.io/libpod/alpine_labels:latest" ) diff --git a/test/e2e/login_logout_test.go b/test/e2e/login_logout_test.go index 3f76daa67..66289dfc3 100644 --- a/test/e2e/login_logout_test.go +++ b/test/e2e/login_logout_test.go @@ -55,7 +55,7 @@ var _ = Describe("Podman login and logout", func() { } } - session := podmanTest.Podman([]string{"run", "--entrypoint", "htpasswd", "registry:2", "-Bbn", "podmantest", "test"}) + session := podmanTest.Podman([]string{"run", "--entrypoint", "htpasswd", "registry:2.6", "-Bbn", "podmantest", "test"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -84,7 +84,7 @@ var _ = Describe("Podman login and logout", func() { strings.Join([]string{authPath, "/auth"}, ":"), "-e", "REGISTRY_AUTH=htpasswd", "-e", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm", "-e", "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "-v", strings.Join([]string{certPath, "/certs"}, ":"), "-e", "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", - "-e", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key", "registry:2"}) + "-e", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key", "registry:2.6"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -228,7 +228,7 @@ var _ = Describe("Podman login and logout", func() { strings.Join([]string{authPath, "/auth"}, ":"), "-e", "REGISTRY_AUTH=htpasswd", "-e", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm", "-e", "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "-v", strings.Join([]string{certPath, "/certs"}, ":"), "-e", "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", - "-e", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key", "registry:2"}) + "-e", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key", "registry:2.6"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) diff --git a/test/endpoint/config.go b/test/endpoint/config.go index 84f8ecb4c..9d2a5a239 100644 --- a/test/endpoint/config.go +++ b/test/endpoint/config.go @@ -12,7 +12,7 @@ var ( CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry, infra, labels} nginx = "quay.io/libpod/alpine_nginx:latest" BB_GLIBC = "docker.io/library/busybox:glibc" - registry = "docker.io/library/registry:2" + registry = "docker.io/library/registry:2.6" labels = "quay.io/libpod/alpine_labels:latest" ) diff --git a/test/system/150-login.bats b/test/system/150-login.bats index 89ae30a18..00c60ca95 100644 --- a/test/system/150-login.bats +++ b/test/system/150-login.bats @@ -61,9 +61,9 @@ function setup() { mkdir -p ${PODMAN_LOGIN_WORKDIR}/runroot PODMAN_LOGIN_ARGS="--root ${PODMAN_LOGIN_WORKDIR}/root --runroot ${PODMAN_LOGIN_WORKDIR}/runroot" # Give it three tries, to compensate for flakes - run_podman ${PODMAN_LOGIN_ARGS} pull registry:2 || - run_podman ${PODMAN_LOGIN_ARGS} pull registry:2 || - run_podman ${PODMAN_LOGIN_ARGS} pull registry:2 + run_podman ${PODMAN_LOGIN_ARGS} pull registry:2.6 || + run_podman ${PODMAN_LOGIN_ARGS} pull registry:2.6 || + run_podman ${PODMAN_LOGIN_ARGS} pull registry:2.6 # Registry image needs a cert. Self-signed is good enough. CERT=$AUTHDIR/domain.crt @@ -77,7 +77,7 @@ function setup() { # Store credentials where container will see them if [ ! -e $AUTHDIR/htpasswd ]; then run_podman ${PODMAN_LOGIN_ARGS} run --rm \ - --entrypoint htpasswd registry:2 \ + --entrypoint htpasswd registry:2.6 \ -Bbn ${PODMAN_LOGIN_USER} ${PODMAN_LOGIN_PASS} \ > $AUTHDIR/htpasswd @@ -97,7 +97,7 @@ function setup() { -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 } # END first "test" - start a registry for use by other tests |