From ed0440cca2b886765c2185427f0e750feb52e112 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 25 Sep 2023 23:37:01 +0100 Subject: [PATCH] Parametrise Github/Dockerhub dockerfile Not a big win as-is. It will make the upcoming introduction of multilib-devel a bit saner. Signed-off-by: Emil Velikov --- .gitlab-ci.yml | 11 ++++++++++- docker-library.template | 10 ---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ccf14f..891cee8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -317,7 +317,16 @@ publish-dockerhub: - git reset --hard FETCH_HEAD - head="release/${BUILD_VERSION}" - git checkout -b "$head" - - envsubst < ../docker-library.template > library/archlinux + - cp ../docker-library.template library/archlinux + - | + for group in base base-devel; do + test "${group}" = "base" && extra="latest, " || extra="" + echo "Tags: ${extra}${group}, ${group}-${BUILD_VERSION}" >> library/archlinux + echo "GitCommit: ${BUILD_COMMIT}" >> library/archlinux + echo "GitFetch: refs/tags/v${BUILD_VERSION}" >> library/archlinux + echo "File: Dockerfile.${group}" >> library/archlinux + echo >> library/archlinux + done - git diff - git add library/archlinux - maintainers="$(grep \(@ ../docker-library.template | cut -d\( -f2 | cut -d\) -f1 | xargs)" diff --git a/docker-library.template b/docker-library.template index c2f5dc2..fa3a4f1 100644 --- a/docker-library.template +++ b/docker-library.template @@ -5,13 +5,3 @@ Maintainers: Santiago Torres-Arias (@SantiagoTorres), Justin Kromlinger (@hashworks) GitRepo: https://gitlab.archlinux.org/archlinux/archlinux-docker.git -Tags: latest, base, base-${BUILD_VERSION} -GitCommit: ${BUILD_COMMIT} -GitFetch: refs/tags/v${BUILD_VERSION} -File: Dockerfile.base - -Tags: base-devel, base-devel-${BUILD_VERSION} -GitCommit: ${BUILD_COMMIT} -GitFetch: refs/tags/v${BUILD_VERSION} -File: Dockerfile.base-devel -