Provide a pretty release link in the Dockerfile

Resolves #49.
This commit is contained in:
Justin Kromlinger 2020-11-18 19:04:34 +01:00
parent 67dddfbf76
commit 6b36cb9812
No known key found for this signature in database
GPG Key ID: 69EF6D9E49A64EB8
3 changed files with 3 additions and 0 deletions

View File

@ -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

View File

@ -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 && \

View File

@ -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)