diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2022-07-30 01:50:45 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2022-08-02 16:52:56 +0200 |
| commit | 2303632250168b0d856d4fcfe0b5d1a77ca8b873 (patch) | |
| tree | 68d56089c23976c992d547407658f9b89d99d386 /hack | |
| parent | 74155705e4486a0bec0ca2606926ed27b37ed962 (diff) | |
| download | podman-2303632250168b0d856d4fcfe0b5d1a77ca8b873.tar.gz podman-2303632250168b0d856d4fcfe0b5d1a77ca8b873.tar.bz2 podman-2303632250168b0d856d4fcfe0b5d1a77ca8b873.zip | |
Use httpasswd from the surrouding OS instead of the registry image
htpasswd is no longer included in docker.io/library/distribution
after 2.7.0, per https://github.com/docker/distribution-library-image/issues/107 ,
and we want to upgrade to a recent version.
At least system tests currently execute htpasswd from the OS,
so it seems that it is likely to be available.
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Diffstat (limited to 'hack')
| -rwxr-xr-x | hack/podman-registry | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/hack/podman-registry b/hack/podman-registry index f6a266883..84faafb48 100755 --- a/hack/podman-registry +++ b/hack/podman-registry @@ -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 |