diff --git a/README.md b/README.md index 67e98647..f3809b7b 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ bind-mounting the runtime state directory (`/serverdir/node`) into your local filesystem. ```bash -docker run --rm -ti -p80:80 -p5432:5432 -p8544-8547:8544-8547 -v /tmp/eth-runtime-test:/serverdir/node ghcr.io/oasisprotocol/sapphire-localnet:local +docker run --rm -ti -p5432:5432 -p8544-8548:8544-8548 -v /tmp/eth-runtime-test:/serverdir/node ghcr.io/oasisprotocol/sapphire-localnet:local ``` If needed, the `oasis-web3-gateway` or `sapphire-paratime` executables could also be @@ -46,7 +46,7 @@ the full gateway & paratime stack together. For running tests, start the docker network without the gateway, by setting the `OASIS_DOCKER_NO_GATEWAY=yes` environment variable: ```bash -docker run --rm -ti -e OASIS_DOCKER_NO_GATEWAY=yes -p80:80 -p5432:5432 -p8544-8547:8544-8547 -v /tmp/eth-runtime-test:/serverdir/node ghcr.io/oasisprotocol/sapphire-localnet:local +docker run --rm -ti -e OASIS_DOCKER_NO_GATEWAY=yes -p5432:5432 -p8544-8548:8544-8548 -v /tmp/eth-runtime-test:/serverdir/node ghcr.io/oasisprotocol/sapphire-localnet:local ``` Once bootstrapped, run the tests: diff --git a/docker/common/start.sh b/docker/common/start.sh index fe6bc081..57c6daf7 100755 --- a/docker/common/start.sh +++ b/docker/common/start.sh @@ -28,7 +28,7 @@ export OASIS_DOCKER_DEBUG_DISK_AND_CPU_USAGE=${OASIS_DOCKER_DEBUG_DISK_AND_CPU_U export OASIS_SINGLE_COMPUTE_NODE=${OASIS_SINGLE_COMPUTE_NODE:-1} -export EXPLORER_PORT=${EXPLORER_PORT:-80} +export EXPLORER_PORT=${EXPLORER_PORT:-8548} OASIS_WEB3_GATEWAY_VERSION=$(${OASIS_WEB3_GATEWAY_BINARY} -v | head -n1 | cut -d " " -f 3 | sed -r 's/^v//') OASIS_CORE_VERSION=$(${OASIS_NODE_BINARY} -v | head -n1 | cut -d " " -f 3 | sed -r 's/^v//') diff --git a/docker/emerald-localnet/Dockerfile b/docker/emerald-localnet/Dockerfile index 817abb3f..c338e4c0 100644 --- a/docker/emerald-localnet/Dockerfile +++ b/docker/emerald-localnet/Dockerfile @@ -133,8 +133,7 @@ RUN wget --quiet "https://github.com/oasisprotocol/oasis-core/releases/download/ && echo "${VERSION}" > /VERSION \ && strip -S -x ${OASIS_NET_RUNNER_BINARY} ${OASIS_NODE_BINARY} ${OASIS_CLI_BINARY} -# Explorer port. -EXPOSE 80/tcp + # Envoy proxy port. EXPOSE 8544/tcp # Web3 gateway http and ws ports. @@ -142,6 +141,8 @@ EXPOSE 8545/tcp EXPOSE 8546/tcp # Nexus port. EXPOSE 8547/tcp +# Explorer port. +EXPOSE 8548/tcp USER root ENTRYPOINT ["/start.sh"] diff --git a/docker/sapphire-localnet/Dockerfile b/docker/sapphire-localnet/Dockerfile index 090db986..3d54dd8a 100644 --- a/docker/sapphire-localnet/Dockerfile +++ b/docker/sapphire-localnet/Dockerfile @@ -196,8 +196,6 @@ RUN echo "Write VERSION information." \ && ${OASIS_CLI_BINARY} --version \ && echo -# Explorer port. -EXPOSE 80/tcp # Envoy proxy port. EXPOSE 8544/tcp # Web3 gateway http and ws ports. @@ -205,6 +203,8 @@ EXPOSE 8545/tcp EXPOSE 8546/tcp # Nexus port. EXPOSE 8547/tcp +# Explorer port. +EXPOSE 8548/tcp USER root ENTRYPOINT ["/start.sh"]