mirrors/archlinux-docker
1
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/archlinux-docker.git synced 2025-08-05 21:57:13 +02:00
Code Issues Projects Releases Wiki Activity

Provide rootfs file name to make-dockerfile.sh script

Browse Source 
Fixes https://gitlab.archlinux.org/archlinux/archlinux-docker/-/jobs/186685
This commit is contained in:
Justin Kromlinger 2023-10-22 15:37:37 +02:00
parent 82f4544917
commit fb332d2218
No known key found for this signature in database
GPG Key ID: 69EF6D9E49A64EB8
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -244,7 +244,7 @@ release:
echo "Uploading ${group}.tar.zst.SHA256" echo "Uploading ${group}.tar.zst.SHA256"
curl -sSf --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file output/${group}.tar.zst.SHA256 ${PACKAGE_REGISTRY_URL}/${group}-${BUILD_VERSION}.tar.zst.SHA256 curl -sSf --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file output/${group}.tar.zst.SHA256 ${PACKAGE_REGISTRY_URL}/${group}-${BUILD_VERSION}.tar.zst.SHA256
package_url=$(./ci/get-public-download-for-generic-package.sh ${group}-${BUILD_VERSION}.tar.zst) package_url=$(./ci/get-public-download-for-generic-package.sh ${group}-${BUILD_VERSION}.tar.zst)
./scripts/make-dockerfile.sh "${group}" "output" "curl -sOJL \"${package_url}\"" "${group}" ./scripts/make-dockerfile.sh "${group}-${BUILD_VERSION}.tar.zst" "${group}" "output" "curl -sOJL \"${package_url}\"" "${group}"
sed -i "/^COPY ${group}.tar.zst \/$/d" output/Dockerfile.${group} sed -i "/^COPY ${group}.tar.zst \/$/d" output/Dockerfile.${group}
done done
- > - >

2
Makefile
View File

@ -12,7 +12,7 @@ $(OUTPUTDIR)/%.tar.zst:
.PRECIOUS: $(OUTPUTDIR)/Dockerfile.% .PRECIOUS: $(OUTPUTDIR)/Dockerfile.%
$(OUTPUTDIR)/Dockerfile.%: $(OUTPUTDIR)/%.tar.zst $(OUTPUTDIR)/Dockerfile.%: $(OUTPUTDIR)/%.tar.zst
scripts/make-dockerfile.sh $(*) $(OUTPUTDIR) "true" "Dev" scripts/make-dockerfile.sh "$(*).tar.zst" $(*) $(OUTPUTDIR) "true" "Dev"
# The following is for local builds only, it is not used by the CI/CD pipeline # The following is for local builds only, it is not used by the CI/CD pipeline

11
scripts/make-dockerfile.sh
View File

@ -2,16 +2,17 @@
set -euo pipefail set -euo pipefail
declare -r GROUP="$1" declare -r ROOTFS_FILE="$1"
declare -r OUTPUTDIR="$2" declare -r GROUP="$2"
declare -r DOWNLOAD="$3" declare -r OUTPUTDIR="$3"
declare -r TITLE="$4" declare -r DOWNLOAD="$4"
declare -r TITLE="$5"
# Do not use these directly in the sed below - it will mask git failures # Do not use these directly in the sed below - it will mask git failures
BUILD_VERSION="${BUILD_VERSION:-dev}" BUILD_VERSION="${BUILD_VERSION:-dev}"
CI_COMMIT_SHA="${CI_COMMIT_SHA:-$(git rev-parse HEAD)}" CI_COMMIT_SHA="${CI_COMMIT_SHA:-$(git rev-parse HEAD)}"
sed -e "s|TEMPLATE_ROOTFS_FILE|$GROUP.tar.zst|" \ sed -e "s|TEMPLATE_ROOTFS_FILE|$ROOTFS_FILE|" \
-e "s|TEMPLATE_ROOTFS_DOWNLOAD|$DOWNLOAD|" \ -e "s|TEMPLATE_ROOTFS_DOWNLOAD|$DOWNLOAD|" \
-e "s|TEMPLATE_ROOTFS_HASH|$(cat $OUTPUTDIR/$GROUP.tar.zst.SHA256)|" \ -e "s|TEMPLATE_ROOTFS_HASH|$(cat $OUTPUTDIR/$GROUP.tar.zst.SHA256)|" \
-e "s|TEMPLATE_TITLE|Arch Linux $TITLE Image|" \ -e "s|TEMPLATE_TITLE|Arch Linux $TITLE Image|" \