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

Bump boulder version to v0.20251110.0

Browse Source
This commit is contained in:
Arjan H
2025-11-14 15:09:09 +01:00
parent e808b18d2a
commit 78b63c2b9b
20 changed files with 180 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/build.sh
View File

@@ -8,7 +8,7 @@ TMP_DIR=$(pwd)/tmp
rm -rf $TMP_DIR && mkdir -p $TMP_DIR/{admin,bin,logs,src}
boulderDir=$TMP_DIR/src
boulderTag="v0.20251021.0"
boulderTag="v0.20251110.0"
boulderUrl="https://github.com/letsencrypt/boulder/"
cloneDir=$(pwd)/..

4
build/docker-compose.yml
View File

@@ -94,7 +94,7 @@ services:
bash -c "sleep 20 && mysql_upgrade -h bmysql"
bredis:
image: redis:6.2.7
image: redis:7.0.15
volumes:
- ./test/:/test/:cached
- boulder_data:/opt/boulder/labca
@@ -106,7 +106,7 @@ services:
restart: always
bconsul:
image: hashicorp/consul:1.15.4
image: hashicorp/consul:1.19.2
depends_on:
- control
volumes:

11
build/tag_and_upload.sh
View File

@@ -29,8 +29,13 @@ die() {
[ -f "tmp/labca-gui" ] || die "LabCA binary does not exist!"
docker build -f Dockerfile-gui -t $LABCA_GUI_TAG .
field=3
if [ $(docker images | grep "DISK USAGE" | wc -l) != "0" ]; then
field=2
fi
if [ "$BRANCH" == "master" ] || [ "$BRANCH" == "main" ]; then
ID="$(docker images | grep "${REPO_BASE}-gui" | grep -v latest | head -n 1 | awk '{print $3}')"
ID="$(docker images | grep "${REPO_BASE}-gui" | grep -v latest | head -n 1 | awk -v f="$field" '{print $f}')"
docker tag "$ID" $LABCA_GUI_LATEST
fi
@@ -39,14 +44,14 @@ cnt=$(ls -1 tmp/bin | wc -l)
docker build -f Dockerfile-boulder -t $LABCA_BOULDER_TAG .
if [ "$BRANCH" == "master" ] || [ "$BRANCH" == "main" ]; then
ID="$(docker images | grep "${REPO_BASE}-boulder" | grep -v latest | head -n 1 | awk '{print $3}')"
ID="$(docker images | grep "${REPO_BASE}-boulder" | grep -v latest | head -n 1 | awk -v f="$field" '{print $f}')"
docker tag "$ID" $LABCA_BOULDER_LATEST
fi
docker build -f Dockerfile-control -t $LABCA_CONTROL_TAG .
if [ "$BRANCH" == "master" ] || [ "$BRANCH" == "main" ]; then
ID="$(docker images | grep "${REPO_BASE}-control" | grep -v latest | head -n 1 | awk '{print $3}')"
ID="$(docker images | grep "${REPO_BASE}-control" | grep -v latest | head -n 1 | awk -v f="$field" '{print $f}')"
docker tag "$ID" $LABCA_CONTROL_LATEST
fi

2
build/tmp.patch
View File

@@ -50,7 +50,7 @@ index c0c7fc838..fd9a67f35 100644
+ bash -c "sleep 20 && mysql_upgrade -h bmysql"
+
bredis:
image: redis:6.2.7
image: redis:7.0.15
volumes:
- ./test/:/test/:cached
- - /home/labca/boulder_labca:/opt/boulder/labca