diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 043c7ec806baff2fb5429ee1870597f8d1bc4053..52634d48b2655c9e019755dda58282ed7b7e81c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -202,6 +202,7 @@ release: curl -sSf --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file output/${group}.tar.xz.SHA256 ${PACKAGE_REGISTRY_URL}/${group}-${BUILD_VERSION}.tar.xz.SHA256 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_HASH|$(cat output/${group}.tar.xz.SHA256)|" output/Dockerfile.${group} done diff --git a/Dockerfile.template b/Dockerfile.template index 550bc3e9249626d8f6019ed45fd7c93f389c72a5..032033170f02656cbf07cd969033ee0a077cbdcb 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -12,6 +12,7 @@ FROM alpine:3.12 AS verify COPY TEMPLATE_ROOTFS_FILE / RUN apk add --no-cache curl bash SHELL ["/bin/bash", "-c"] +# TEMPLATE_ROOTFS_RELEASE_URL RUN ROOTFS="$(curl -sOJL --continue-at - -w "%{filename_effective}" TEMPLATE_ROOTFS_URL)" && \ sha256sum -c <<< "TEMPLATE_ROOTFS_HASH" && \ mkdir /rootfs && \ diff --git a/Makefile b/Makefile index e8274612a137ae7035d4db3897bbcfd72277ffce..21f3dc494204b233c77530715aa54495351a0f75 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,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_HASH|$$(cat $(OUTPUTDIR)/$(1).tar.xz.SHA256)|" \ Dockerfile.template > $(OUTPUTDIR)/Dockerfile.$(1)