From dcdab5864b9aeab0c748bde7a69bd44fa63d02a8 Mon Sep 17 00:00:00 2001
From: Phil Porada <philporada@gmail.com>
Date: Fri, 24 May 2024 12:04:59 -0400
Subject: [PATCH] Document port mapping instead

---
 Dockerfile.release |  3 ---
 README.md          | 13 ++++++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Dockerfile.release b/Dockerfile.release
index 7551683a..71df3841 100644
--- a/Dockerfile.release
+++ b/Dockerfile.release
@@ -27,8 +27,5 @@ ENTRYPOINT [ "/app.exe" ]
 
 # Final stage: dynamically select between Linux and Windows stages based on TARGETOS argument
 FROM ${TARGETOS} AS final
-# Ports needed for testing when not using docker compose.
-EXPOSE 14000
-EXPOSE 15000
 # Add test configuration files
 COPY ./test/ /test/
diff --git a/README.md b/README.md
index 28e3db90..a431bb07 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@ at `https://localhost:14000/dir`.
 
 Pebble includes a [docker-compose](https://docs.docker.com/compose/) file that
 will create a `pebble` instance that uses a `pebble-challtestsrv` instance for
-DNS resolution.
+DNS resolution with the correct ports mapped to the host system.
 
 To download and start the containers run:
 
@@ -119,6 +119,13 @@ See the [pebble-challtestsrv
 README](https://github.com/letsencrypt/pebble/blob/master/cmd/pebble-challtestsrv/README.md)
 for more information.
 
+If you are running a one-off container for either `pebble` or
+`pebble-challtestsrv`, you will need to manually map ports.
+```
+docker run -p 14000:14000 -p 15000:15000 ghcr.io/letsencrypt/pebble:latest
+docker run -p 5001:5001 -p 5002:5002 -p 5003:5003 -p 8053:8053 -p 8055:8055 -p 8443:8443 ghcr.io/letsencrypt/pebble-challtestsrv:latest
+```
+
 #### Prebuilt Docker Images
 
 Pebble releases are published as Docker images to the
@@ -145,9 +152,9 @@ services:
 With a Docker command:
 
 ```bash
-docker run -e "PEBBLE_VA_NOSLEEP=1" ghcr.io/letsencrypt/pebble
+docker run -p 14000:14000 -p 15000:15000 -e "PEBBLE_VA_NOSLEEP=1" ghcr.io/letsencrypt/pebble
 # or
-docker run -e "PEBBLE_VA_NOSLEEP=1" --mount src=$(pwd)/my-pebble-config.json,target=/test/my-pebble-config.json,type=bind ghcr.io/letsencrypt/pebble pebble -config /test/my-pebble-config.json
+docker run -p 14000:14000 -p 15000:15000 -e "PEBBLE_VA_NOSLEEP=1" --mount src=$(pwd)/my-pebble-config.json,target=/test/my-pebble-config.json,type=bind ghcr.io/letsencrypt/pebble pebble -config /test/my-pebble-config.json
 ```
 
 ### Default validation ports