ci: using buildx with caching support, to build images

Author: nxtcoder17

.github/workflows/build-and-release.yml

@@ -49,23 +49,44 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Docker
-        uses: docker/setup-docker-action@v4
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
+        uses: nxtcoder17/actions/setup-docker@main
         with:
-          registry: ${{ env.REGISTRY_URL }}
-          username: ${{ env.REGISTRY_USERNAME }}
-          password: ${{ env.REGISTRY_PASSWORD }}
+          docker_registry: ${{ env.REGISTRY_URL }}
+          docker_username: ${{ env.REGISTRY_USERNAME }}
+          docker_password: ${{ env.REGISTRY_PASSWORD }}
+
+      # - name: Log in to the Container registry
+      #   uses: docker/login-action@v3
+      #   with:
+      #     registry: ${{ env.REGISTRY_URL }}
+      #     username: ${{ env.REGISTRY_USERNAME }}
+      #     password: ${{ env.REGISTRY_PASSWORD }}
+
+      # - name: Build Image
+      #   id: build_image
+      #   shell: bash
+      #   env:
+      #     IMAGE: "ghcr.io/${{ github.repository}}:${{matrix.fedora_version}}"
+      #   run: |+
+      #     docker buildx build \
+      #       -t $IMAGE -f ./Containerfile . --build-arg FEDORA_VERSION=${{ matrix.fedora_version }}
+      #     docker push $IMAGE
 
       - name: Build Image
         id: build_image
         shell: bash
         env:
           IMAGE: "ghcr.io/${{ github.repository}}:${{matrix.fedora_version}}"
+          buildx_cache_master: "ghcr.io/${{ github.repository }}:buildx-cache-master"
+          buildx_cache: "ghcr.io/${{ github.repository }}:buildx-cache-${{matrix.fedora_version}}"
         run: |+
-          docker build -t $IMAGE -f ./Containerfile . --build-arg FEDORA_VERSION=${{ matrix.fedora_version }}
-          docker push $IMAGE
+          docker buildx build -t $IMAGE  -f ./Containerfile \
+            --build-arg FEDORA_VERSION="${{ matrix.fedora_version }}" \
+            --cache-to type=registry,ref="$buildx_cache",mode=max,compression=zstd,compression-level=13,force-compression=true \
+            --cache-from type=registry,ref="$buildx_cache" \
+            --cache-from type=registry,ref="$buildx_cache_master" \
+            --output=type=image,compression=zstd,force-compression=true,compression-level=13,push=true \
+            .
 
       # - name: Build Image
       #   id: build_image

Containerfile

@@ -17,13 +17,12 @@ ARG NVIDIA_AKMODS_DIGEST=""
 
 # Stage 1: Clone ublue-os/main and merge packages
 FROM alpine/git AS buildctx
-ARG UBLUE_MAIN_VERSION="main"
-
 RUN apk add --no-cache yq jq
 
 RUN <<EOF
-  echo "Cloning ublue-os/main repo (branch: $UBLUE_MAIN_VERSION)..."
-  git clone --depth=1 --branch "${UBLUE_MAIN_VERSION}" \
+  git_branch="main"
+  echo "Cloning ublue-os/main repo (branch: $git_branch)..."
+  git clone --depth=1 --branch "${git_branch}" \
     https://github.com/ublue-os/main.git ./ublue-os
   mv ublue-os/sys_files /
   mv ublue-os/build_files/* /
@@ -36,23 +35,15 @@ RUN <<EOF
   set -ex
   echo "Merging ublue packages with custom packages..."
 
-  # Extract ublue packages for "all" and "silverblue" sections
-  UBLUE_ALL=$(jq -r '.all.include.all[]' /ublue-packages.json)
-  UBLUE_SILVERBLUE=$(jq -r '.all.include.silverblue[]' /ublue-packages.json)
-
   # Convert your YAML packages to JSON array
-  YOUR_PACKAGES=$(yq -o=json '.packages' /packages.yml)
-
-  # Merge all three lists, deduplicate and sort
-  jq -n \
-    --arg ublue_all "$UBLUE_ALL" \
-    --arg ublue_sb "$UBLUE_SILVERBLUE" \
-    --argjson yours "$YOUR_PACKAGES" \
-    '{"packages": (($ublue_all | split("\n")) + ($ublue_sb | split("\n")) + $yours | unique | sort)}' \
-    > /packages.json
-
-  echo "Final package list ($(jq -r '.packages | length' /packages.json) packages):"
-  jq -r '.packages[]' /packages.json
+  yq -o=json /packages.yml > /additional-packages.json
+
+  jq --slurpfile pkgs /additional-packages.json \
+   '.all.include.silverblue += $pkgs[0].packages' \
+   /ublue-packages.json > /packages.json
+
+  echo "also installing user packages"
+  jq -r '.all.include.silverblue' </packages.json
 EOF
 
 # Stage 2: Get kernel modules from ublue-os
@@ -82,16 +73,19 @@ set -ouex pipefail
 rm -f /usr/bin/chsh /usr/bin/lchsh
 
 echo "Running ublue-os build scripts..."
-
 /ctx/install.sh
 
 AKMODNV_PATH=/tmp/akmods-nv-rpms /ctx/nvidia-install.sh
 
 /ctx/initramfs.sh
 /ctx/post-install.sh
-
 EOF
 
 # Validate the image
 RUN ["bootc", "container", "lint"]
 
+# RUN rpm-ostree override remove firefox firefox-langpacks
+# RUN rpm-ostree cleanup -m
+#
+# RUN sed -i "s|^NAME=.*|NAME=nxtcoder17 edition silverblue ${FEDORA_VERSION}|" /usr/lib/os-release
+# RUN sed -i "s|^PRETTY_NAME=.*|PRETTY_NAME=nxtcoder17 edition silverblue ${FEDORA_VERSION}|" /usr/lib/os-release

packages.yml

@@ -1,2 +1,4 @@
 packages:
+  - docker
   - hyprland
+  - distrobox