diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-08-02 20:09:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-02 20:09:10 +0000 |
| commit | 49ae6cfed67dbc38408c85b3be52af69fa8f031d (patch) | |
| tree | 3bd355609715d56a0f4126179c0876cfece3aa4d /hack | |
| parent | 87f892e5b56c2fab2f394f8cc79794ccce03f510 (diff) | |
| parent | 5c95c0920f32b61021395ec2700884d136240de7 (diff) | |
| download | podman-49ae6cfed67dbc38408c85b3be52af69fa8f031d.tar.gz podman-49ae6cfed67dbc38408c85b3be52af69fa8f031d.tar.bz2 podman-49ae6cfed67dbc38408c85b3be52af69fa8f031d.zip | |
Merge pull request #15142 from mtrmac/sigstore-sign-4.2
[v4.2] Sigstore sign
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 |