Reset registry storage permissions for mirrored data

Author: ggiguash

test/bin/mirror_registry.sh

@@ -13,15 +13,27 @@ QUAY_CONFIG_DIR="${MIRROR_REGISTRY_DIR}/config"
 PULL_SECRET=${PULL_SECRET:-${HOME}/.pull-secret.json}
 QUAY_PULL_SECRET="${QUAY_CONFIG_DIR}/pull_secret.json"
 
+reset_storage_permissions() {
+    # Ensure that permissions are open for the current user on the mirror registry
+    # directories and files
+    if [ -d "${MIRROR_REGISTRY_DIR}" ] ; then
+        sudo chgrp -R "$(id -gn)" "${MIRROR_REGISTRY_DIR}"
+        sudo find "${MIRROR_REGISTRY_DIR}" -type d -exec chmod a+rx '{}' +
+        sudo find "${MIRROR_REGISTRY_DIR}" -type f -exec chmod a+r  '{}' +
+    fi
+}
+
 setup_prereqs() {
     # Install packages if not yet available locally
     if ! rpm -q podman skopeo jq &>/dev/null ; then
         "${SCRIPTDIR}/../../scripts/dnf_retry.sh" "install" "podman skopeo jq"
     fi
 
-    # Create registry repository base directory structure
+    # Create registry repository base directory structure and reset permissions
+    # if downloaded from cache
     mkdir -p "${MIRROR_REGISTRY_DIR}"
     mkdir -p "${QUAY_CONFIG_DIR}"
+    reset_storage_permissions
 
     # Create a new pull secret file containing authentication information for both
     # remote (from PULL_SECRET environment) and local registries
@@ -268,11 +280,7 @@ EOF
 }
 
 finalize_registry() {
-    # Ensure that permissions are open for the current user on the mirror registry
-    # directories and files. This is necessary to avoid 'find' command errors.
-    sudo chgrp -R "$(id -gn)" "${MIRROR_REGISTRY_DIR}"
-    sudo find "${MIRROR_REGISTRY_DIR}" -type d -exec chmod a+rx '{}' +
-    sudo find "${MIRROR_REGISTRY_DIR}" -type f -exec chmod a+r  '{}' +
+    reset_storage_permissions
     # Delete the combined pull secret file
     rm -f "${QUAY_PULL_SECRET}"
 }