From e8d7daa7900a9e7d571d7b7e5e16ad1b5c67839b Mon Sep 17 00:00:00 2001
From: Justin Kromlinger <hashworks@archlinux.org>
Date: Sat, 18 Sep 2021 15:09:58 +0200
Subject: [PATCH] Avoid curl call on local builds

---
 .gitlab-ci.yml      | 2 +-
 Dockerfile.template | 2 +-
 Makefile            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b93dfb5..3963e07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -225,7 +225,7 @@ release:
         sed "/TEMPLATE_ROOTFS_FILE/d" Dockerfile.template > output/Dockerfile.${group}
         package_url=$(./ci/get-public-download-for-generic-package.sh ${group}-${BUILD_VERSION}.tar.xz)
         sed -i "s|TEMPLATE_ROOTFS_RELEASE_URL|https://gitlab.archlinux.org/archlinux/archlinux-docker/-/releases/v${BUILD_VERSION}|" output/Dockerfile.${group}
-        sed -i "s|TEMPLATE_ROOTFS_URL|${package_url}|" output/Dockerfile.${group}
+        sed -i "s|TEMPLATE_ROOTFS_DOWNLOAD|ROOTFS=\"\$(curl -sOJL -w \"%{filename_effective}\" \"${package_url}\")\"|" output/Dockerfile.${group}
         sed -i "s|TEMPLATE_ROOTFS_HASH|$(cat output/${group}.tar.xz.SHA256)|" output/Dockerfile.${group}
       done
     - >
diff --git a/Dockerfile.template b/Dockerfile.template
index 5440ce1..891a056 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -13,7 +13,7 @@ COPY TEMPLATE_ROOTFS_FILE /
 RUN apk add --no-cache curl bash
 SHELL ["/bin/bash", "-c"]
 # TEMPLATE_ROOTFS_RELEASE_URL
-RUN ROOTFS="$(curl -sOJL -w "%{filename_effective}" TEMPLATE_ROOTFS_URL)" && \
+RUN TEMPLATE_ROOTFS_DOWNLOAD && \
     sha256sum -c <<< "TEMPLATE_ROOTFS_HASH" && \
     mkdir /rootfs && \
     tar -C /rootfs --extract --file "${ROOTFS}"
diff --git a/Makefile b/Makefile
index 9bbf83a..1932f74 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ endef
 define dockerfile
 	sed -e "s|TEMPLATE_ROOTFS_FILE|$(1).tar.xz|" \
 	    -e "s|TEMPLATE_ROOTFS_RELEASE_URL|Local build|" \
-	    -e "s|TEMPLATE_ROOTFS_URL|file:///$(1).tar.xz|" \
+	    -e "s|TEMPLATE_ROOTFS_DOWNLOAD|ROOTFS=\"$(1).tar.xz\"|" \
 	    -e "s|TEMPLATE_ROOTFS_HASH|$$(cat $(OUTPUTDIR)/$(1).tar.xz.SHA256)|" \
 	    Dockerfile.template > $(OUTPUTDIR)/Dockerfile.$(1)
 endef