diff options
author | Miloslav Trmač <mitr@redhat.com> | 2022-07-30 17:21:15 +0200 |
---|---|---|
committer | Miloslav Trmač <mitr@redhat.com> | 2022-07-30 17:23:38 +0200 |
commit | 7599fde73e383824196854174847094d148b72a0 (patch) | |
tree | ae5752ea5c6823a16002fc95f75dd08a7125e4dd /test | |
parent | 68463278e3b22a03fa7a711f4993381747e5e2fc (diff) | |
download | podman-7599fde73e383824196854174847094d148b72a0.tar.gz podman-7599fde73e383824196854174847094d148b72a0.tar.bz2 podman-7599fde73e383824196854174847094d148b72a0.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>
Diffstat (limited to 'test')
-rw-r--r-- | test/e2e/login_logout_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
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)) |