commit cf69aa40f0d15387afe755791f26526f991856da parent 21d75c62283d15196c8e82e1942896e5ced2850c Author: Florian Dold <florian@dold.me> Date: Mon, 23 Jun 2025 17:32:09 +0200 support ipv6 Diffstat:
| M | buildconfig/challenger.tag | | | 2 | +- |
| M | sandcastle-run | | | 9 | ++++++--- |
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/buildconfig/challenger.tag b/buildconfig/challenger.tag @@ -1 +1 @@ -v1.0.1 +v1.0.2 diff --git a/sandcastle-run b/sandcastle-run @@ -44,10 +44,12 @@ SETUP_NAME=${SANDCASTLE_SETUP_NAME:-demo} if [[ -n ${SANDCASTLE_OVERRIDE_NAME:-} ]]; then OVERRIDES="-v $PWD/overrides/${SANDCASTLE_OVERRIDE_NAME}:/overrides:Z" EXTERNAL_PORT=$(source $PWD/overrides/${SANDCASTLE_OVERRIDE_NAME}; echo ${EXTERNAL_PORT:-}) - EXTERNAL_IP=$(source $PWD/overrides/${SANDCASTLE_OVERRIDE_NAME}; echo ${EXTERNAL_IP:-127.0.0.1}) + EXTERNAL_IP4=$(source $PWD/overrides/${SANDCASTLE_OVERRIDE_NAME}; echo ${EXTERNAL_IP:-127.0.0.1}) + EXTERNAL_IP6=$(source $PWD/overrides/${SANDCASTLE_OVERRIDE_NAME}; echo ${EXTERNAL_IP:-[::1]}) if [[ $EXTERNAL_PORT =~ ^[0-9]+$ ]]; then echo Serving via port $EXTERNAL_PORT - PUBLISH_EXTERNAL_PORT="-p=${EXTERNAL_IP}${EXTERNAL_IP:+:}${EXTERNAL_PORT}:${EXTERNAL_PORT}" + PUBLISH_EXTERNAL_PORT4="-p=${EXTERNAL_IP4}${EXTERNAL_IP4:+:}${EXTERNAL_PORT}:${EXTERNAL_PORT}" + PUBLISH_EXTERNAL_PORT6="-p=${EXTERNAL_IP6}${EXTERNAL_IP6:+:}${EXTERNAL_PORT}:${EXTERNAL_PORT}" fi else OVERRIDES="" @@ -84,7 +86,8 @@ exec podman run \ -v talerdata:/talerdata:Z \ -v talerdata_persistent:/talerdata_persistent:Z \ $OVERRIDES \ - ${PUBLISH_EXTERNAL_PORT:-} \ + ${PUBLISH_EXTERNAL_PORT4:-} \ + ${PUBLISH_EXTERNAL_PORT6:-} \ -v $PWD/credentials:/credentials:Z \ -v $PWD/data:/data:Z \ -v $PWD/scripts:/scripts:Z \