diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2022-07-30 17:21:15 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2022-08-02 16:52:56 +0200 |
| commit | 52db7637378881479137136395d9d9ede58a3f8a (patch) | |
| tree | 96b7dce041fafe6ed14a2430602b2ee7f6431676 | |
| parent | 2303632250168b0d856d4fcfe0b5d1a77ca8b873 (diff) | |
| download | podman-52db7637378881479137136395d9d9ede58a3f8a.tar.gz podman-52db7637378881479137136395d9d9ede58a3f8a.tar.bz2 podman-52db7637378881479137136395d9d9ede58a3f8a.zip | |
Use existing REGISTRY_IMAGE variables in more places
... instead of hard-coding a copy of the value.
Notably this makes hack/podman_registry actually
support the documented -i option.
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| -rwxr-xr-x | hack/podman-registry | 2 | ||||
| -rw-r--r-- | test/e2e/login_logout_test.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hack/podman-registry b/hack/podman-registry index 84faafb48..f1254966b 100755 --- a/hack/podman-registry +++ b/hack/podman-registry @@ -218,7 +218,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.6 + ${PODMAN_REGISTRY_IMAGE} # Confirm that registry started and port is active wait_for_port $PODMAN_REGISTRY_PORT diff --git a/test/e2e/login_logout_test.go b/test/e2e/login_logout_test.go index efefbb113..60c53e27e 100644 --- a/test/e2e/login_logout_test.go +++ b/test/e2e/login_logout_test.go @@ -85,7 +85,7 @@ var _ = Describe("Podman login and logout", func() { strings.Join([]string{authPath, "/auth:Z"}, ":"), "-e", "REGISTRY_AUTH=htpasswd", "-e", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm", "-e", "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "-v", strings.Join([]string{certPath, "/certs:Z"}, ":"), "-e", "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", - "-e", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key", "registry:2.6"}) + "-e", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key", REGISTRY_IMAGE}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) @@ -249,7 +249,7 @@ var _ = Describe("Podman login and logout", func() { strings.Join([]string{authPath, "/auth:z"}, ":"), "-e", "REGISTRY_AUTH=htpasswd", "-e", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm", "-e", "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "-v", strings.Join([]string{certPath, "/certs:z"}, ":"), "-e", "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", - "-e", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key", "registry:2.6"}) + "-e", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key", REGISTRY_IMAGE}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) |