make it work

bazel-contrib · Nov 30, 2023 · b856ded · b856ded
1 parent c2bd093
commit b856ded
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/oci/private/image.sh.tpl b/oci/private/image.sh.tpl
@@ -33,7 +33,7 @@ function get_option() {
 
 function empty_base() {
     local registry=$1
-    local ref="$registry/image:latest"
+    local ref="$registry/oci/empty_base:latest"
     ref="$("${CRANE}" append --oci-empty-base -t "${ref}" -f {{empty_tar}})"
     ref=$("${CRANE}" config "${ref}" | "${JQ}"  ".rootfs.diff_ids = [] | .history = []" | "${CRANE}" edit config "${ref}")
     ref=$("${CRANE}" manifest "${ref}" | "${JQ}"  ".layers = []" | "${CRANE}" edit manifest "${ref}")
@@ -158,8 +158,12 @@ if [ ${#ENV_EXPANSIONS[@]} -ne 0 ]; then
 fi
 
 if [ -n "$OUTPUT" ]; then
-    "${CRANE}" pull "${REF}" "./${OUTPUT}" --format=oci --prune
-    stop_registry "${STORAGE_DIR}"
+    "${CRANE}" pull "${REF}" "./${OUTPUT}" --format=oci --annotate-ref
+    mv "${OUTPUT}/index.json" "${OUTPUT}/temp.json"
+    "${JQ}" --arg ref "${REF}" '.manifests |= map(select(.annotations["org.opencontainers.image.ref.name"] == $ref)) | del(.manifests[0].annotations)' "${OUTPUT}/temp.json" >  "${OUTPUT}/index.json"
+    rm "${OUTPUT}/temp.json"
+    "${CRANE}" layout gc "./${OUTPUT}"
+    stop_registry "${OUTPUT}"
 fi
 
 } 2>> "${STDERR}"
diff --git a/oci/private/registry/crane_launcher.sh.tpl b/oci/private/registry/crane_launcher.sh.tpl
@@ -1,5 +1,5 @@
 readonly SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
-readonly CRANE_REGISTRY_BIN="/Users/thesayyn/Documents/go-containerregistry/main"
+readonly CRANE_REGISTRY_BIN="${SCRIPT_DIR}/{{CRANE}}"
 
 function start_registry() {
     local storage_dir="$1"

diff --git a/oci/private/registry/zot_launcher.sh.tpl b/oci/private/registry/zot_launcher.sh.tpl
@@ -7,7 +7,6 @@ function start_registry() {
     local deadline="${3:-5}"
     local config_path="$storage_dir/config.json"
 
-    echo "$storage_dir" >&2
     cat > "${config_path}" <<EOF
 {
     "storage": { "rootDirectory": "$storage_dir/..", "dedupe": false, "commit": true },