From 514b188c6913d92bbc561584e2f9dc563568bcc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20K=C3=B6rber?= <github@shredzone.org>
Date: Fri, 7 Jun 2024 17:30:47 +0200
Subject: [PATCH] Remove workaround for Pebble container

---
 acme4j-it/pom.xml                           | 15 +++++++++++----
 acme4j-it/src/main/docker/pebble.dockerfile |  7 -------
 acme4j-it/src/main/docker/pebble.sh         |  6 ------
 3 files changed, 11 insertions(+), 17 deletions(-)
 delete mode 100644 acme4j-it/src/main/docker/pebble.dockerfile
 delete mode 100755 acme4j-it/src/main/docker/pebble.sh

diff --git a/acme4j-it/pom.xml b/acme4j-it/pom.xml
index 65c924b4..c75ead1a 100644
--- a/acme4j-it/pom.xml
+++ b/acme4j-it/pom.xml
@@ -115,10 +115,7 @@
                     <images>
                         <image>
                             <alias>pebble</alias>
-                            <name>acme4j/pebble:${project.version}</name>
-                            <build>
-                                <dockerFile>pebble.dockerfile</dockerFile>
-                            </build>
+                            <name>ghcr.io/letsencrypt/pebble:latest</name>
                             <run>
                                 <ports>
                                     <port>14000:14000</port><!-- ACME API -->
@@ -127,6 +124,15 @@
                                 <links>
                                     <link>bammbamm</link>
                                 </links>
+                                <cmd>
+                                    <exec>
+                                        <arg>-strict</arg>
+                                        <arg>-dnsserver</arg>
+                                        <arg>bammbamm:8053</arg>
+                                        <arg>-config</arg>
+                                        <arg>/test/config/pebble-config.json</arg>
+                                    </exec>
+                                </cmd>
                                 <wait>
                                     <log>Listening</log>
                                 </wait>
@@ -140,6 +146,7 @@
                             <alias>bammbamm</alias>
                             <name>acme4j/challtestsrv:${project.version}</name>
                             <build>
+                                <!-- Workaround for https://github.com/letsencrypt/pebble/issues/418 -->
                                 <dockerFile>challtestsrv.dockerfile</dockerFile>
                             </build>
                             <run>
diff --git a/acme4j-it/src/main/docker/pebble.dockerfile b/acme4j-it/src/main/docker/pebble.dockerfile
deleted file mode 100644
index 5695f44c..00000000
--- a/acme4j-it/src/main/docker/pebble.dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM ghcr.io/letsencrypt/pebble:latest
-
-FROM alpine
-COPY --from=0 /app /app
-COPY --from=0 /test /test
-COPY pebble.sh /
-ENTRYPOINT [ "/pebble.sh" ]
diff --git a/acme4j-it/src/main/docker/pebble.sh b/acme4j-it/src/main/docker/pebble.sh
deleted file mode 100755
index f9705ee6..00000000
--- a/acme4j-it/src/main/docker/pebble.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-BAMMBAMM_IP=$(getent hosts bammbamm|cut -d' ' -f1)
-echo "DNS server at: $BAMMBAMM_IP"
-
-/app -strict -dnsserver $BAMMBAMM_IP:8053 -config /test/config/pebble-config.json