test: get pebble from ghcr.io

Author: buchdag

test/setup/pebble/.env

@@ -1,2 +1,2 @@
-PEBBLE_VERSION='v2.3.1'
+PEBBLE_VERSION='2.5.1'
 PEBBLE_CONFIG='pebble-config.json'

test/setup/pebble/docker-compose.yml

@@ -1,14 +1,14 @@
-version: '3'
+version: "3"
 
 services:
   pebble:
-    image: "letsencrypt/pebble:${PEBBLE_VERSION}"
+    image: "ghcr.io/letsencrypt/pebble:${PEBBLE_VERSION}"
     container_name: pebble
     volumes:
       - "./${PEBBLE_CONFIG}:/test/config/pebble-config.json"
     environment:
       - PEBBLE_VA_NOSLEEP=1
-    command: pebble -config /test/config/pebble-config.json -dnsserver 10.30.50.3:8053
+    command: -config /test/config/pebble-config.json -dnsserver 10.30.50.3:8053
     ports:
       - 14000:14000 # HTTPS ACME API
       - 15000:15000 # HTTPS Management API
@@ -17,9 +17,9 @@ services:
         ipv4_address: 10.30.50.2
 
   challtestsrv:
-    image: "letsencrypt/pebble-challtestsrv:${PEBBLE_VERSION}"
+    image: "ghcr.io/letsencrypt/pebble-challtestsrv:${PEBBLE_VERSION}"
     container_name: challtestserv
-    command: pebble-challtestsrv -tlsalpn01 ""
+    command: -defaultIPv6 "" -defaultIPv4 10.30.50.3
     ports:
       - 8055:8055 # HTTP Management API
     networks:

test/setup/pebble/pebble-config-eab.json

@@ -1,16 +1,21 @@
 {
-    "pebble": {
-        "listenAddress": "0.0.0.0:14000",
-        "managementListenAddress": "0.0.0.0:15000",
-        "certificate": "test/certs/localhost/cert.pem",
-        "privateKey": "test/certs/localhost/key.pem",
-        "httpPort": 80,
-        "tlsPort": 443,
-        "ocspResponderURL": "",
-        "externalAccountBindingRequired": true,
-        "externalAccountMACKeys": {
-            "kid-1": "zWNDZM6eQGHWpSRTPal5eIUYFTu7EajVIoguysqZ9wG44nMEtx3MUAsUDkMTQ12W",
-            "kid-2": "b10lLJs8l1GPIzsLP0s6pMt8O0XVGnfTaCeROxQM0BIt2XrJMDHJZBM5NuQmQJQH"
-        }
-    }
-}
+  "pebble": {
+    "listenAddress": "0.0.0.0:14000",
+    "managementListenAddress": "0.0.0.0:15000",
+    "certificate": "test/certs/localhost/cert.pem",
+    "privateKey": "test/certs/localhost/key.pem",
+    "httpPort": 80,
+    "tlsPort": 443,
+    "ocspResponderURL": "",
+    "externalAccountBindingRequired": true,
+    "externalAccountMACKeys": {
+      "kid-1": "zWNDZM6eQGHWpSRTPal5eIUYFTu7EajVIoguysqZ9wG44nMEtx3MUAsUDkMTQ12W",
+      "kid-2": "b10lLJs8l1GPIzsLP0s6pMt8O0XVGnfTaCeROxQM0BIt2XrJMDHJZBM5NuQmQJQH"
+    },
+    "retryAfter": {
+      "authz": 3,
+      "order": 5
+    },
+    "certificateValidityPeriod": 157766400
+  }
+}

test/setup/pebble/pebble-config.json

@@ -1,12 +1,17 @@
 {
-    "pebble": {
-        "listenAddress": "0.0.0.0:14000",
-        "managementListenAddress": "0.0.0.0:15000",
-        "certificate": "test/certs/localhost/cert.pem",
-        "privateKey": "test/certs/localhost/key.pem",
-        "httpPort": 80,
-        "tlsPort": 443,
-        "ocspResponderURL": "",
-        "externalAccountBindingRequired": false
-    }
-}
+  "pebble": {
+    "listenAddress": "0.0.0.0:14000",
+    "managementListenAddress": "0.0.0.0:15000",
+    "certificate": "test/certs/localhost/cert.pem",
+    "privateKey": "test/certs/localhost/key.pem",
+    "httpPort": 80,
+    "tlsPort": 443,
+    "ocspResponderURL": "",
+    "externalAccountBindingRequired": false,
+    "retryAfter": {
+      "authz": 3,
+      "order": 5
+    },
+    "certificateValidityPeriod": 157766400
+  }
+}