Skip to content

USHIFT-5406: Optimize mirror images operation for repetitive runs #4674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 15, 2025
Merged

USHIFT-5406: Optimize mirror images operation for repetitive runs #4674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02b1809
Add tagging of images during the copy operation
ggiguash Mar 13, 2025
7d5b240
Optimize permissions setting in the mirror_registry.sh script
ggiguash Mar 13, 2025
22e1eaa
Remove extra space
ggiguash Mar 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions scripts/mirror-images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,8 @@ function mirror_registry() {
skopeo_retry copy ${skopeo_opts} --quiet \
--preserve-digests \
--authfile "${img_pull_file}" \
--additional-tag "${dst_img_no_tag}:latest" \
docker://"${src_img}" docker://"${dst_img}"

echo "Tagging '${dst_img_no_tag}' as 'latest'"
# shellcheck disable=SC2086
skopeo_retry copy ${skopeo_opts} --quiet \
--preserve-digests \
--authfile "${img_pull_file}" \
docker://"${dst_img}" docker://"${dst_img_no_tag}:latest"
}

# Export functions for xargs to use
Expand Down Expand Up @@ -153,14 +147,8 @@ function dir_to_registry() {
skopeo_retry copy ${skopeo_opts} --quiet \
--preserve-digests \
--authfile "${img_pull_file}" \
--additional-tag "${dst_img_no_tag}:latest" \
dir://"${local_dir}/${src_img}" docker://"${dst_img}"

echo "Tagging '${dst_img}' as '${dst_img_no_tag}:latest'"
# shellcheck disable=SC2086
skopeo_retry copy ${skopeo_opts} --quiet \
--preserve-digests \
--authfile "${img_pull_file}" \
docker://"${dst_img}" docker://"${dst_img_no_tag}:latest"
}

# Export functions for xargs to use
Expand Down
4 changes: 2 additions & 2 deletions test/bin/mirror_registry.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,8 @@ 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 sudo chmod a+rx '{}' \;
sudo find "${MIRROR_REGISTRY_DIR}" -type f -exec sudo chmod a+r '{}' \;
sudo find "${MIRROR_REGISTRY_DIR}" -type d -exec chmod a+rx '{}' +
sudo find "${MIRROR_REGISTRY_DIR}" -type f -exec chmod a+r '{}' +
}

mirror_images() {
Expand Down