From 64cb18a0c364f4d3b7cdd5cbedb8f35c61f25bbb Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 25 Sep 2023 17:06:55 +0100 Subject: [PATCH] scripts/make-dockerfile.sh: drop TEMPLATE_ROOTFS_RELEASE_URL The field is an inline comment, which by default is not present in the podman log. Plus we do have the exact URL list a couple of lines further down. Haven't seen any other Dockerfile have one either, so let's nuke it. Signed-off-by: Emil Velikov --- .gitlab-ci.yml | 1 - Dockerfile.template | 1 - scripts/make-dockerfile.sh | 1 - 3 files changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 038afa8..1a19745 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -246,7 +246,6 @@ release: sed "/COPY TEMPLATE_ROOTFS_FILE/d" Dockerfile.template > output/Dockerfile.${group} sed -i "s|TEMPLATE_ROOTFS_FILE|${group}.tar.zst|" output/Dockerfile.${group} package_url=$(./ci/get-public-download-for-generic-package.sh ${group}-${BUILD_VERSION}.tar.zst) - 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_DOWNLOAD|curl -sOJL \"${package_url}\"|" output/Dockerfile.${group} sed -i "s|TEMPLATE_ROOTFS_HASH|$(cat output/${group}.tar.zst.SHA256)|" output/Dockerfile.${group} sed -i "s|TEMPLATE_TITLE|Arch Linux ${group} Image|" output/Dockerfile.${group} diff --git a/Dockerfile.template b/Dockerfile.template index 507f57b..c691df8 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -15,7 +15,6 @@ COPY TEMPLATE_ROOTFS_FILE / RUN apk add --no-cache curl tar zstd -# TEMPLATE_ROOTFS_RELEASE_URL RUN TEMPLATE_ROOTFS_DOWNLOAD && \ echo "TEMPLATE_ROOTFS_HASH" > /tmp/sha256sums.txt && \ sha256sum -c /tmp/sha256sums.txt && \ diff --git a/scripts/make-dockerfile.sh b/scripts/make-dockerfile.sh index 782c567..545d61c 100755 --- a/scripts/make-dockerfile.sh +++ b/scripts/make-dockerfile.sh @@ -6,7 +6,6 @@ declare -r GROUP="$1" declare -r OUTPUTDIR="$2" sed -e "s|TEMPLATE_ROOTFS_FILE|$GROUP.tar.zst|" \ - -e "s|TEMPLATE_ROOTFS_RELEASE_URL|Local build|" \ -e "s|TEMPLATE_ROOTFS_DOWNLOAD|true|" \ -e "s|TEMPLATE_ROOTFS_HASH|$(cat $OUTPUTDIR/$GROUP.tar.zst.SHA256)|" \ -e "s|TEMPLATE_TITLE|Arch Linux Dev Image|" \