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 release-2024-01-08

Browse Source
This commit is contained in:
Arjan H
2024-01-12 20:37:34 +01:00
parent 0adcce1f1f
commit dec3a1b822
20 changed files with 285 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
build/tmp.patch
View File

@@ -1,17 +1,17 @@
diff --git a/docker-compose.yml b/docker-compose.yml
index 74f1cf0f8..da119321b 100644
index aeb34b387..16db397ae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ name: labca
services:
boulder:
# Should match one of the GO_DEV_VERSIONS in test/boulder-tools/tag_and_upload.sh.
- image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.21.4_2023-11-09}
@@ -5,7 +5,7 @@ services:
# 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: ghcr.io/hakwerk/labca-boulder:${LABCA_IMAGE_VERSION:-latest}
environment:
# To solve HTTP-01 and TLS-ALPN-01 challenges, change the IP in FAKE_DNS
# to the IP address where your ACME client's solver is listening.
@@ -15,12 +15,9 @@ services:
build:
context: test/boulder-tools/
# Should match one of the GO_DEV_VERSIONS in test/boulder-tools/tag_and_upload.sh.
@@ -22,12 +22,9 @@ services:
# Forward the parent env's GOEXPERIMENT value into the container.
GOEXPERIMENT: ${GOEXPERIMENT:-}
volumes:
@@ -27,7 +27,7 @@ index 74f1cf0f8..da119321b 100644
networks:
bluenet:
ipv4_address: 10.77.77.77
@@ -44,6 +41,7 @@ services:
@@ -51,6 +48,7 @@ services:
depends_on:
- bmysql
- bconsul
@@ -35,7 +35,7 @@ index 74f1cf0f8..da119321b 100644
entrypoint: labca/entrypoint.sh
working_dir: &boulder_working_dir /opt/boulder
logging:
@@ -78,8 +76,10 @@ services:
@@ -85,8 +83,10 @@ services:
bconsul:
image: hashicorp/consul:1.15.4
@@ -47,7 +47,7 @@ index 74f1cf0f8..da119321b 100644
networks:
consulnet:
ipv4_address: 10.55.55.10
@@ -87,27 +87,28 @@ services:
@@ -94,27 +94,28 @@ services:
ipv4_address: 10.77.77.10
rednet:
ipv4_address: 10.88.88.10
@@ -86,7 +86,7 @@ index 74f1cf0f8..da119321b 100644
logging:
driver: "json-file"
options:
@@ -124,27 +125,26 @@ services:
@@ -131,27 +132,26 @@ services:
- 80:80
- 443:443
volumes:
@@ -128,7 +128,7 @@ index 74f1cf0f8..da119321b 100644
expose:
- 3030
environment:
@@ -155,6 +155,14 @@ services:
@@ -162,6 +162,14 @@ services:
volumes:
dbdata: