rechunk doesn't work. don't even pretend lad

Author: lina-bh

.github/workflows/build.yml

@@ -39,10 +39,10 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       # This is optional, but if you see that your builds are way too big for the runners, you can enable this by uncommenting the following lines:
-      - name: Maximize build space
-        uses: ublue-os/remove-unwanted-software@517622d6452028f266b7ba4cc9a123b5f58a6b53 # v7
-        with:
-          remove-codeql: true
+      # - name: Maximize build space
+      #   uses: ublue-os/remove-unwanted-software@517622d6452028f266b7ba4cc9a123b5f58a6b53 # v7
+      #   with:
+      #     remove-codeql: true
 
       - name: Setup just
         uses: extractions/setup-just@v3
@@ -125,15 +125,10 @@ jobs:
         uses: redhat-actions/push-to-registry@5ed88d269cf581ea9ef6dd6806d01562096bee9c # v2
         if: github.event_name != 'pull_request' && github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
         id: push
-        env:
-          REGISTRY_USER: ${{ github.actor }}
-          REGISTRY_PASSWORD: ${{ github.token }}
         with:
           registry: ${{ steps.registry_case.outputs.lowercase }}
           image: ${{ steps.image_case.outputs.lowercase }}
           tags: ${{ steps.metadata.outputs.tags }}
-          username: ${{ env.REGISTRY_USER }}
-          password: ${{ env.REGISTRY_PASSWORD }}
           extra-args: |
             --compression-format=zstd
 

Justfile

@@ -106,59 +106,22 @@ sudoif command *args:
 # Build the image using the specified parameters
 build $target_image=image_name $tag=default_tag $dx="0" $hwe="0" $gdx="0":
     #!/usr/bin/env bash
-
-    # Get Version
-    ver="${tag}-${centos_version}.$(date +%Y%m%d)"
+    set -eo pipefail
 
     BUILD_ARGS=()
-    BUILD_ARGS+=("--build-arg" "MAJOR_VERSION=${centos_version}")
-    BUILD_ARGS+=("--build-arg" "IMAGE_NAME=${target_image}")
-    BUILD_ARGS+=("--build-arg" "IMAGE_VENDOR=${repo_organization}")
-    BUILD_ARGS+=("--build-arg" "ENABLE_DX=${dx}")
-    BUILD_ARGS+=("--build-arg" "ENABLE_HWE=${hwe}")
-    BUILD_ARGS+=("--build-arg" "ENABLE_GDX=${gdx}")
-    if [[ -z "$(git status -s)" ]]; then
-        BUILD_ARGS+=("--build-arg" "SHA_HEAD_SHORT=$(git rev-parse --short HEAD)")
-    fi
+    while IFS=$'\n' read -r label; do
+        BUILD_ARGS+=("--label" "$label")
+    done <<< $GENERATED_LABELS && unset label
 
     podman build \
+        "${BUILD_ARGS[@]}" \
         --pull=newer \
-        --tag "${target_image}:unchunked" \
+        --tag "${target_image}:${tag}" \
         --cache-from "ghcr.io/${repo_organization}/${target_image}" \
         .
-
-    tmp="$(mktemp -d)"
-    cleanup_tmp() {
-        rm -r "$tmp"
-        podman rm -fiv rechunk
-    }
-    trap cleanup_tmp EXIT
-    
-    podman run \
-        --rm \
-        --mount=type=image,src="${target_image}":unchunked,target=/var/tree,rw=true \
-        --mount=type=volume,target=/var/ostree \
-        --mount=type=bind,src="$tmp",target=/workspace \
-        --security-opt=label=disable \
-        --user 0:0 \
-        --env TREE=/var/tree \
-        --env INIT_REPO=1 \
-        --env REPO=/var/ostree/repo \
-        --env PREV_REF="ghcr.io/${repo_organization}/${target_image}:latest" \
-        --env OUT_NAME="${target_image}" \
-        --env OUT_REF="oci-archive:/workspace/image.tar" \
-        --env SKIP_COMPRESSION=1 \
-        --env LABELS="$GENERATED_LABELS" \
-        --env RESET_TIMESTAMP="$RESET_TIMESTAMP" \
-        --name rechunk \
-        ghcr.io/hhd-dev/rechunk:latest \
-        sh -c '/sources/rechunk/1_prune.sh && /sources/rechunk/2_create.sh && touch $OUT_NAME.changelog.txt && /sources/rechunk/3_chunk.sh'
-    podman rmi -f "${target_image}:unchunked"
-    chunked_img="$(podman image import -c LABEL=containers.bootc=1 --message imported "${tmp}/image.tar")"
-    podman tag "$chunked_img" "${target_image}:latest"
     test -n "$GENERATED_TAGS" && for tag in $GENERATED_TAGS; do
-        podman tag "$chunked_img" "${target_image}:${tag}"
-    done
+        podman tag "${target_image}:${tag}" "${target_image}:${tag}"
+    done || :
 
 # Command: _rootful_load_image
 # Description: This script checks if the current user is root or running under sudo. If not, it attempts to resolve the image tag using podman inspect.