From 99cd2f49190d5b2067746bbd5293ad15ea3b6eea Mon Sep 17 00:00:00 2001 From: kexkey Date: Fri, 8 Oct 2021 12:18:58 -0400 Subject: [PATCH] Published mosquitto images don't have openssl libs since ~1 month --- dist/setup.sh | 2 +- notifier_docker/Dockerfile | 2 +- proxy_docker/Dockerfile | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/setup.sh b/dist/setup.sh index 8b4f78b..f1d336d 100755 --- a/dist/setup.sh +++ b/dist/setup.sh @@ -858,7 +858,7 @@ CYPHERAPPS_VERSION="dev" BITCOIN_VERSION="v0.21.1" LIGHTNING_VERSION="v0.10.1" TRAEFIK_VERSION="v1.7.9-alpine" -MOSQUITTO_VERSION="1.6" +MOSQUITTO_VERSION="1.6-openssl" SETUP_DIR=$(dirname $(realpath $0)) diff --git a/notifier_docker/Dockerfile b/notifier_docker/Dockerfile index 3da0f2b..2b858a8 100644 --- a/notifier_docker/Dockerfile +++ b/notifier_docker/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-mosquitto:1.6 +FROM eclipse-mosquitto:1.6-openssl ENV HOME /notifier diff --git a/proxy_docker/Dockerfile b/proxy_docker/Dockerfile index b560ae4..fb57860 100644 --- a/proxy_docker/Dockerfile +++ b/proxy_docker/Dockerfile @@ -14,10 +14,10 @@ COPY app/data/* ./ COPY app/script/* ./ COPY app/tests/* ./tests/ COPY --from=cyphernode/clightning:v0.10.1 /usr/local/bin/lightning-cli ./ -COPY --from=eclipse-mosquitto:1.6 /usr/bin/mosquitto_rr /usr/bin/mosquitto_sub /usr/bin/mosquitto_pub /usr/bin/ -COPY --from=eclipse-mosquitto:1.6 /usr/lib/libmosquitto* /usr/lib/ -COPY --from=eclipse-mosquitto:1.6 /usr/lib/libcrypto* /usr/lib/ -COPY --from=eclipse-mosquitto:1.6 /usr/lib/libssl* /usr/lib/ +COPY --from=eclipse-mosquitto:1.6-openssl /usr/bin/mosquitto_rr /usr/bin/mosquitto_sub /usr/bin/mosquitto_pub /usr/bin/ +COPY --from=eclipse-mosquitto:1.6-openssl /usr/lib/libmosquitto* /usr/lib/ +COPY --from=eclipse-mosquitto:1.6-openssl /usr/lib/libcrypto* /usr/lib/ +COPY --from=eclipse-mosquitto:1.6-openssl /usr/lib/libssl* /usr/lib/ RUN chmod +x startproxy.sh requesthandler.sh lightning-cli sqlmigrate*.sh waitanyinvoice.sh tests/* \ && chmod o+w . \