opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-18 15:54:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11099 from edsantiago/podman_registry_tweak

Browse Source 
podman-registry: minor usability updates
This commit is contained in:
openshift-ci[bot]
2021-08-02 21:41:54 +00:00
committed by GitHub
parent 58cdb3236f 03ffba29a2
commit d25f8d07b3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hack/podman-registry
View File

@ -7,7 +7,7 @@ ME=$(basename $0)
############################################################################### ###############################################################################
# BEGIN defaults # 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_USER=
PODMAN_REGISTRY_PASS= 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. # If we ever get here, it's a given that the registry is not running.
# Clean up after ourselves. # Clean up after ourselves.
rm -rf ${PODMAN_REGISTRY_WORKDIR} ${PODMAN} unshare rm -rf ${PODMAN_REGISTRY_WORKDIR}
exit 1 exit 1
fi fi
} }
@ -214,7 +214,8 @@ function do_stop() {
podman stop registry podman stop registry
podman rm -f 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}
} }