diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2021-08-02 21:41:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 21:41:54 +0000 |
| commit | d25f8d07b3bbc11be1caa0838a031f0e5dc223a8 (patch) | |
| tree | f789f83661c0eab326629701ebfad5a3c88676c2 | |
| parent | 58cdb3236f7ac4940eaa265c83f25e68eacf0b42 (diff) | |
| parent | 03ffba29a20b919b2a692fd0fe07c428e69ccb4f (diff) | |
| download | podman-d25f8d07b3bbc11be1caa0838a031f0e5dc223a8.tar.gz podman-d25f8d07b3bbc11be1caa0838a031f0e5dc223a8.tar.bz2 podman-d25f8d07b3bbc11be1caa0838a031f0e5dc223a8.zip | |
Merge pull request #11099 from edsantiago/podman_registry_tweak
podman-registry: minor usability updates
| -rwxr-xr-x | hack/podman-registry | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hack/podman-registry b/hack/podman-registry index 6ccc59655..3f0aa2aea 100755 --- a/hack/podman-registry +++ b/hack/podman-registry @@ -7,7 +7,7 @@ ME=$(basename $0) ############################################################################### # BEGIN defaults -PODMAN_REGISTRY_IMAGE=docker.io/library/registry:2.6 +PODMAN_REGISTRY_IMAGE=quay.io/libpod/registry:2.6 PODMAN_REGISTRY_USER= PODMAN_REGISTRY_PASS= @@ -117,7 +117,7 @@ function must_pass() { # If we ever get here, it's a given that the registry is not running. # Clean up after ourselves. - rm -rf ${PODMAN_REGISTRY_WORKDIR} + ${PODMAN} unshare rm -rf ${PODMAN_REGISTRY_WORKDIR} exit 1 fi } @@ -214,7 +214,8 @@ function do_stop() { podman stop registry podman rm -f registry - rm -rf ${PODMAN_REGISTRY_WORKDIR} + # Use straight podman, not our alias function, to avoid 'overlay: EBUSY' + ${PODMAN} unshare rm -rf ${PODMAN_REGISTRY_WORKDIR} } |