github-personal/labca
1
0
Fork 0
mirror of https://github.com/outbackdingo/labca.git synced 2026-01-27 18:19:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set correct tag for building docker images

Browse Source
This commit is contained in:
Arjan H
2024-01-13 08:29:59 +01:00
parent c005dddbb8
commit 1f6992cc5c
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/build.sh
View File

@@ -26,6 +26,9 @@ if [ "$BUILD_IMAGE" == "" ]; then
BUILD_IMAGE=$(eval echo $(grep boulder-tools $TMP_DIR/src/docker-compose.yml | grep "image:" | head -1 | sed -e "s/image://" | sed -e "s/&boulder_image//"))
fi
BOULDER_TOOLS_TAG=$(grep go1. $TMP_DIR/src/.github/workflows/boulder-ci.yml | head -1 | sed -e "s/\s*- //")
BUILD_IMAGE=${BUILD_IMAGE/latest/$BOULDER_TOOLS_TAG}
echo
$cloneDir/patch.sh
cp -r test labca

2
build/tmp.patch
View File

@@ -6,7 +6,7 @@ index aeb34b387..16db397ae 100644
# The `letsencrypt/boulder-tools:latest` tag is automatically built in local
# dev environments. In CI a specific BOULDER_TOOLS_TAG is passed, and it is
# pulled with `docker compose pull`.
- image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.21.5_2023-12-11}
- image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-latest}
+ image: ghcr.io/hakwerk/labca-boulder:${LABCA_IMAGE_VERSION:-latest}
build:
context: test/boulder-tools/

1
dev/versions
View File

@@ -77,7 +77,6 @@ echo
echo "Boulder CI tag(s):"
grep go1. ../boulder/.github/workflows/boulder-ci.yml
colorCITag build/tmp.patch
colorCITag build/Dockerfile-boulder
echo

2
patches/docker-compose.patch
View File

@@ -11,7 +11,7 @@ index c580176cd..aeb34b387 100644
# dev environments. In CI a specific BOULDER_TOOLS_TAG is passed, and it is
# pulled with `docker compose pull`.
- image: letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-latest}
+ image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.21.5_2023-12-11}
+ image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-latest}
build:
context: test/boulder-tools/
# Should match one of the GO_DEV_VERSIONS in test/boulder-tools/tag_and_upload.sh.