summaryrefslogtreecommitdiff
path: root/hack/podman-registry
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2021-08-02 14:00:44 -0600
committerEd Santiago <santiago@redhat.com>2021-08-02 14:01:47 -0600
commit03ffba29a20b919b2a692fd0fe07c428e69ccb4f (patch)
treef789f83661c0eab326629701ebfad5a3c88676c2 /hack/podman-registry
parent58cdb3236f7ac4940eaa265c83f25e68eacf0b42 (diff)
downloadpodman-03ffba29a20b919b2a692fd0fe07c428e69ccb4f.tar.gz
podman-03ffba29a20b919b2a692fd0fe07c428e69ccb4f.tar.bz2
podman-03ffba29a20b919b2a692fd0fe07c428e69ccb4f.zip
podman-registry: minor usability updates
1) use cached quay.io image 2) use 'podman unshare' when rm -rf'ing, to avoid EPERM Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'hack/podman-registry')
-rwxr-xr-xhack/podman-registry7
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}
}