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-2023-07-11

Browse Source
This commit is contained in:
Arjan H
2023-07-12 20:20:38 +02:00
parent 5eefbf2ea8
commit 8be46cda73
16 changed files with 48 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
build/tmp.patch
View File

@@ -1,5 +1,5 @@
diff --git a/docker-compose.yml b/docker-compose.yml
index 6a1d77c44..c93ed0e3c 100644
index 02958b245..869b7d5de 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,9 @@
@@ -8,14 +8,14 @@ index 6a1d77c44..c93ed0e3c 100644
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.20.4_2023-05-02}
- image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.20.5_2023-06-20}
+ 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.
@@ -11,12 +12,9 @@ services:
BOULDER_CONFIG_DIR: &boulder_config_dir labca/config
GOFLAGS: -mod=vendor
@@ -13,12 +14,9 @@ services:
# Forward the parent env's GOEXPERIMENT value into the container.
GOEXPERIMENT: ${GOEXPERIMENT:-}
volumes:
- - .:/opt/boulder:cached
- - /home/labca/boulder_labca:/opt/boulder/labca
@@ -29,7 +29,7 @@ index 6a1d77c44..c93ed0e3c 100644
networks:
bluenet:
ipv4_address: 10.77.77.77
@@ -40,6 +38,7 @@ services:
@@ -42,6 +40,7 @@ services:
depends_on:
- bmysql
- bconsul
@@ -37,7 +37,7 @@ index 6a1d77c44..c93ed0e3c 100644
entrypoint: labca/entrypoint.sh
working_dir: &boulder_working_dir /opt/boulder
logging:
@@ -74,8 +73,10 @@ services:
@@ -76,8 +75,10 @@ services:
bconsul:
image: hashicorp/consul:1.14.2
@@ -49,7 +49,7 @@ index 6a1d77c44..c93ed0e3c 100644
networks:
consulnet:
ipv4_address: 10.55.55.10
@@ -83,27 +84,28 @@ services:
@@ -85,27 +86,28 @@ services:
ipv4_address: 10.77.77.10
rednet:
ipv4_address: 10.88.88.10
@@ -88,7 +88,7 @@ index 6a1d77c44..c93ed0e3c 100644
logging:
driver: "json-file"
options:
@@ -120,27 +122,26 @@ services:
@@ -122,27 +124,26 @@ services:
- 80:80
- 443:443
volumes:
@@ -130,7 +130,7 @@ index 6a1d77c44..c93ed0e3c 100644
expose:
- 3030
environment:
@@ -151,6 +152,14 @@ services:
@@ -153,6 +154,14 @@ services:
volumes:
dbdata: