From fb332d2218739a4a1900835773e35d17279b972c Mon Sep 17 00:00:00 2001
From: Justin Kromlinger <hashworks@archlinux.org>
Date: Sun, 22 Oct 2023 15:37:37 +0200
Subject: [PATCH] Provide rootfs file name to make-dockerfile.sh script

Fixes https://gitlab.archlinux.org/archlinux/archlinux-docker/-/jobs/186685
---
 .gitlab-ci.yml             |  2 +-
 Makefile                   |  2 +-
 scripts/make-dockerfile.sh | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a64387e..2d1fc5c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -244,7 +244,7 @@ release:
         echo "Uploading ${group}.tar.zst.SHA256"
         curl -sSf --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file output/${group}.tar.zst.SHA256 ${PACKAGE_REGISTRY_URL}/${group}-${BUILD_VERSION}.tar.zst.SHA256
         package_url=$(./ci/get-public-download-for-generic-package.sh ${group}-${BUILD_VERSION}.tar.zst)
-        ./scripts/make-dockerfile.sh "${group}" "output" "curl -sOJL \"${package_url}\"" "${group}"
+        ./scripts/make-dockerfile.sh "${group}-${BUILD_VERSION}.tar.zst" "${group}" "output" "curl -sOJL \"${package_url}\"" "${group}"
         sed -i "/^COPY ${group}.tar.zst \/$/d" output/Dockerfile.${group}
       done
     - >
diff --git a/Makefile b/Makefile
index 31a0b81..b95c38c 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ $(OUTPUTDIR)/%.tar.zst:
 
 .PRECIOUS: $(OUTPUTDIR)/Dockerfile.%
 $(OUTPUTDIR)/Dockerfile.%: $(OUTPUTDIR)/%.tar.zst
-	scripts/make-dockerfile.sh $(*) $(OUTPUTDIR) "true" "Dev"
+	scripts/make-dockerfile.sh "$(*).tar.zst" $(*) $(OUTPUTDIR) "true" "Dev"
 
 # The following is for local builds only, it is not used by the CI/CD pipeline
 
diff --git a/scripts/make-dockerfile.sh b/scripts/make-dockerfile.sh
index b90adaf..9cb75ff 100755
--- a/scripts/make-dockerfile.sh
+++ b/scripts/make-dockerfile.sh
@@ -2,16 +2,17 @@
 
 set -euo pipefail
 
-declare -r GROUP="$1"
-declare -r OUTPUTDIR="$2"
-declare -r DOWNLOAD="$3"
-declare -r TITLE="$4"
+declare -r ROOTFS_FILE="$1"
+declare -r GROUP="$2"
+declare -r OUTPUTDIR="$3"
+declare -r DOWNLOAD="$4"
+declare -r TITLE="$5"
 
 # Do not use these directly in the sed below - it will mask git failures
 BUILD_VERSION="${BUILD_VERSION:-dev}"
 CI_COMMIT_SHA="${CI_COMMIT_SHA:-$(git rev-parse HEAD)}"
 
-sed -e "s|TEMPLATE_ROOTFS_FILE|$GROUP.tar.zst|" \
+sed -e "s|TEMPLATE_ROOTFS_FILE|$ROOTFS_FILE|" \
     -e "s|TEMPLATE_ROOTFS_DOWNLOAD|$DOWNLOAD|" \
     -e "s|TEMPLATE_ROOTFS_HASH|$(cat $OUTPUTDIR/$GROUP.tar.zst.SHA256)|" \
     -e "s|TEMPLATE_TITLE|Arch Linux $TITLE Image|" \