lightning: start lightningd via tools/docker-entrypoint.sh

Their script does some wrapping. E.g. it implements EXPOSE_TCP. This fixes #3. Hopefully this will be future-proof. #4 (comment)
darwin · Jul 7, 2019 · 506f8aa · 506f8aa
1 parent 5abf982
commit 506f8aa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/recipes/cookbook/scaffold/docker/lightning/Dockerfile b/recipes/cookbook/scaffold/docker/lightning/Dockerfile
@@ -108,6 +108,7 @@ WORKDIR /home/simnet
 ENV LIGHTNINGD_DATA=/home/simnet/.lightning
 
 COPY --chown=simnet "docker/lightning/home" "."
+COPY --chown=simnet --from=simverse_buildtime_lightning /root/build/tools/docker-entrypoint.sh lightning-docker-entrypoint.sh
 COPY --chown=simnet "$LIGHTNING_CONF_PATH" "seed-config"
 
 RUN mkdir .lightning
diff --git a/recipes/cookbook/scaffold/docker/lightning/home/lightningd.sh b/recipes/cookbook/scaffold/docker/lightning/home/lightningd.sh
@@ -55,4 +55,4 @@ fi
 PARAMS+=" --disable-dns"
 
 set -x
-exec lightningd ${PARAMS} ${LIGHTNINGD_EXTRA_PARAMS} "$@"
+exec lightning-docker-entrypoint.sh ${PARAMS} ${LIGHTNINGD_EXTRA_PARAMS} "$@"
diff --git a/recipes/cookbook/templates/lightning.yml b/recipes/cookbook/templates/lightning.yml
@@ -38,6 +38,7 @@
       - CONTAINER_SERVICE_PORT=${CONTAINER_SERVICE_PORT}
       - SERVICE_COUNTER=${SERVICE_COUNTER}
       - EXPOSE_TCP=true # TODO: maybe we want to move this somewhere else
+      - LIGHTNINGD_RPC_PORT=${LIGHTNING_RPC_PORT}
       - LN_COUNTER=${LN_COUNTER}
       - LIGHTNING_COUNTER=${LIGHTNING_COUNTER}
       - DEBUG=${DEBUG}