From e661aa6a2f63a3530e4fe5523cdec9ffa69c23c8 Mon Sep 17 00:00:00 2001
From: Arch Linux Docker release bot <project10185_bot2@example.com>
Date: Sun, 19 Sep 2021 09:08:33 +0000
Subject: [PATCH] Release 20210919.0.34673

---
 .gitlab-ci.yml        | 2 +-
 Dockerfile.base       | 6 +++---
 Dockerfile.base-devel | 6 +++---
 3 files changed, 7 insertions(+), 7 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.base b/Dockerfile.base
index 93887ee..6eb9ddd 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -11,9 +11,9 @@
 FROM alpine:3.12 AS verify
 RUN apk add --no-cache curl bash
 SHELL ["/bin/bash", "-c"]
-# https://gitlab.archlinux.org/archlinux/archlinux-docker/-/releases/v20210918.0.34551
-RUN ROOTFS="$(curl -sOL --continue-at - -w "%{filename_effective}" https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files/1494/download)" && \
-    sha256sum -c <<< "b4dd3ed2bb02616c456cd7d3c3f31c876b13721ba2cea0aa19923fceb4fae355  base-20210918.0.34551.tar.xz" && \
+# https://gitlab.archlinux.org/archlinux/archlinux-docker/-/releases/v20210919.0.34673
+RUN ROOTFS="$(curl -sOJL -w "%{filename_effective}" "https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files/1498/download")" && \
+    sha256sum -c <<< "867e4d20a6fbaa22e31602285353bce4d85f64236cb33deb899daa7d4d862566  base-20210919.0.34673.tar.xz" && \
     mkdir /rootfs && \
     tar -C /rootfs --extract --file "${ROOTFS}"
 
diff --git a/Dockerfile.base-devel b/Dockerfile.base-devel
index f0bf67d..54c579e 100644
--- a/Dockerfile.base-devel
+++ b/Dockerfile.base-devel
@@ -11,9 +11,9 @@
 FROM alpine:3.12 AS verify
 RUN apk add --no-cache curl bash
 SHELL ["/bin/bash", "-c"]
-# https://gitlab.archlinux.org/archlinux/archlinux-docker/-/releases/v20210918.0.34551
-RUN ROOTFS="$(curl -sOL --continue-at - -w "%{filename_effective}" https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files/1496/download)" && \
-    sha256sum -c <<< "c5b8bb571e24e337e87b0b075faf136b5ecad80d543ef2ddabf7caf66422bbf3  base-devel-20210918.0.34551.tar.xz" && \
+# https://gitlab.archlinux.org/archlinux/archlinux-docker/-/releases/v20210919.0.34673
+RUN ROOTFS="$(curl -sOJL -w "%{filename_effective}" "https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files/1500/download")" && \
+    sha256sum -c <<< "5896d7321aa9d842059fc235a6dd293bec1a7d0556ca093772b89c432a764951  base-devel-20210919.0.34673.tar.xz" && \
     mkdir /rootfs && \
     tar -C /rootfs --extract --file "${ROOTFS}"