From e88b72bb2fdf655e2cba68e0397eeea4bbe006f5 Mon Sep 17 00:00:00 2001 From: Arjan H Date: Tue, 6 Feb 2024 20:25:29 +0100 Subject: [PATCH] Bump boulder version to release-2024-02-06 --- build/build.sh | 2 +- build/docker-compose.yml | 2 -- build/tmp.patch | 12 +++++------- install | 2 +- patches/docker-compose-redis.patch | 4 ++-- patches/docker-compose.patch | 8 ++++---- patches/mail_mailer.patch | 2 +- 7 files changed, 14 insertions(+), 18 deletions(-) diff --git a/build/build.sh b/build/build.sh index f950f7a..27c7ce0 100755 --- a/build/build.sh +++ b/build/build.sh @@ -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="release-2024-01-22" +boulderTag="release-2024-02-06" boulderUrl="https://github.com/letsencrypt/boulder/" cloneDir=$(pwd)/.. diff --git a/build/docker-compose.yml b/build/docker-compose.yml index 16db397..a0c99be 100644 --- a/build/docker-compose.yml +++ b/build/docker-compose.yml @@ -92,8 +92,6 @@ services: ipv4_address: 10.55.55.10 bluenet: ipv4_address: 10.77.77.10 - rednet: - ipv4_address: 10.88.88.10 command: "consul agent -dev -config-format=hcl -config-file=/opt/boulder/labca/consul/config.hcl" working_dir: /opt/boulder restart: always diff --git a/build/tmp.patch b/build/tmp.patch index af55ba2..6a3a86f 100644 --- a/build/tmp.patch +++ b/build/tmp.patch @@ -1,5 +1,5 @@ diff --git a/docker-compose.yml b/docker-compose.yml -index aeb34b387..16db397ae 100644 +index b61c84199..a0c99bed4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: @@ -35,7 +35,7 @@ index aeb34b387..16db397ae 100644 entrypoint: labca/entrypoint.sh working_dir: &boulder_working_dir /opt/boulder logging: -@@ -85,8 +83,10 @@ services: +@@ -85,34 +83,37 @@ services: bconsul: image: hashicorp/consul:1.15.4 @@ -47,10 +47,8 @@ index aeb34b387..16db397ae 100644 networks: consulnet: ipv4_address: 10.55.55.10 -@@ -94,27 +94,28 @@ services: + bluenet: ipv4_address: 10.77.77.10 - rednet: - ipv4_address: 10.88.88.10 - command: "consul agent -dev -config-format=hcl -config-file=/test/consul/config.hcl" + command: "consul agent -dev -config-format=hcl -config-file=/opt/boulder/labca/consul/config.hcl" + working_dir: /opt/boulder @@ -86,7 +84,7 @@ index aeb34b387..16db397ae 100644 logging: driver: "json-file" options: -@@ -131,27 +132,26 @@ services: +@@ -129,27 +130,26 @@ services: - 80:80 - 443:443 volumes: @@ -128,7 +126,7 @@ index aeb34b387..16db397ae 100644 expose: - 3030 environment: -@@ -162,6 +162,14 @@ services: +@@ -160,6 +160,14 @@ services: volumes: dbdata: diff --git a/install b/install index 2c4550e..217e97a 100755 --- a/install +++ b/install @@ -30,7 +30,7 @@ dockerComposeVersion="v2.5.0" labcaUrl="https://github.com/hakwerk/labca/" boulderUrl="https://github.com/letsencrypt/boulder/" -boulderTag="release-2024-01-22" +boulderTag="release-2024-02-06" # Feature flags flag_skip_redis=true diff --git a/patches/docker-compose-redis.patch b/patches/docker-compose-redis.patch index 0d70668..009de54 100644 --- a/patches/docker-compose-redis.patch +++ b/patches/docker-compose-redis.patch @@ -1,5 +1,5 @@ diff --git a/docker-compose.yml b/docker-compose.yml -index 6a918c2e2..c580176cd 100644 +index 7fc8f8de5..2ce16d12c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,8 +30,6 @@ services: @@ -65,7 +65,7 @@ index 6a918c2e2..c580176cd 100644 bconsul: image: hashicorp/consul:1.15.4 volumes: -@@ -161,13 +119,6 @@ networks: +@@ -159,13 +117,6 @@ networks: config: - subnet: 10.88.88.0/24 diff --git a/patches/docker-compose.patch b/patches/docker-compose.patch index c32b6b2..e426b2b 100644 --- a/patches/docker-compose.patch +++ b/patches/docker-compose.patch @@ -1,5 +1,5 @@ diff --git a/docker-compose.yml b/docker-compose.yml -index c580176cd..aeb34b387 100644 +index 2ce16d12c..b61c84199 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,11 @@ @@ -97,9 +97,9 @@ index c580176cd..aeb34b387 100644 bconsul: image: hashicorp/consul:1.15.4 -@@ -97,12 +95,73 @@ services: - rednet: - ipv4_address: 10.88.88.10 +@@ -95,12 +93,73 @@ services: + bluenet: + ipv4_address: 10.77.77.10 command: "consul agent -dev -config-format=hcl -config-file=/test/consul/config.hcl" + restart: always diff --git a/patches/mail_mailer.patch b/patches/mail_mailer.patch index 0df700e..72c875d 100644 --- a/patches/mail_mailer.patch +++ b/patches/mail_mailer.patch @@ -60,7 +60,7 @@ index 4249108e..ee8b6fb4 100644 + ctx, cancel := context.WithDeadline(context.Background(), deadline) + defer cancel() + -+ addrs, err := di.dnsClient.LookupHost(ctx, di.server) ++ addrs, _, err := di.dnsClient.LookupHost(ctx, di.server) if err != nil { - return nil, err + problem := probs.DNS("%v")