diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2022-07-30 17:26:07 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2022-07-30 17:26:07 +0200 |
| commit | b01478044b47ac07697a8db1b5eb7f7922b058cc (patch) | |
| tree | 3fe80d7b54a44a87884ecf917f079ced75445fe0 /hack | |
| parent | fed326d8a6f8d4f7dc490099b29d51fc1754789f (diff) | |
| parent | 5a5624f8189c0e4c529e4c00d6ed66397d1db5b4 (diff) | |
| download | podman-b01478044b47ac07697a8db1b5eb7f7922b058cc.tar.gz podman-b01478044b47ac07697a8db1b5eb7f7922b058cc.tar.bz2 podman-b01478044b47ac07697a8db1b5eb7f7922b058cc.zip | |
Merge branch 'registry-2.8' into HEAD
Diffstat (limited to 'hack')
| -rwxr-xr-x | hack/podman-registry | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/hack/podman-registry b/hack/podman-registry index f6a266883..f1b68deaa 100755 --- a/hack/podman-registry +++ b/hack/podman-registry @@ -7,7 +7,7 @@ ME=$(basename $0) ############################################################################### # BEGIN defaults -PODMAN_REGISTRY_IMAGE=quay.io/libpod/registry:2.6 +PODMAN_REGISTRY_IMAGE=quay.io/libpod/registry:2.8 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.6\" + PODMAN_REGISTRY_IMAGE=\"docker.io/library/registry:2.8\" PODMAN_REGISTRY_PORT=\"5050\" PODMAN_REGISTRY_USER=\"userZ3RZ\" PODMAN_REGISTRY_PASS=\"T8JVJzKrcl4p6uT\" @@ -197,13 +197,11 @@ function do_start() { # Store credentials where container will see them. We can't run # this one via must_pass because we need its stdout. - podman run --rm \ - --entrypoint htpasswd ${PODMAN_REGISTRY_IMAGE} \ - -Bbn ${PODMAN_REGISTRY_USER} ${PODMAN_REGISTRY_PASS} \ + htpasswd -Bbn ${PODMAN_REGISTRY_USER} ${PODMAN_REGISTRY_PASS} \ > $AUTHDIR/htpasswd if [ $? -ne 0 ]; then rm -rf ${PODMAN_REGISTRY_WORKDIR} - die "Command failed: podman run [htpasswd]" + die "Command failed: htpasswd" fi # In case someone needs to debug @@ -220,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 |