From 67d51365b8d1675b53df5a3a8d433d474257965c Mon Sep 17 00:00:00 2001 From: kexkey Date: Thu, 11 Mar 2021 14:12:45 -0500 Subject: [PATCH] Upgraded versions: Alpine, Bitcoin Core, C-Lightning, etc. --- api_auth_docker/Dockerfile | 2 +- cron_docker/Dockerfile | 2 +- cyphernodeconf_docker/Dockerfile | 6 ++-- .../templates/installer/testfeatures.sh | 3 +- dist/setup.sh | 34 ++++++++----------- otsclient_docker/Dockerfile | 12 ++----- proxy_docker/Dockerfile | 4 +-- pycoin_docker/Dockerfile | 6 ++-- tor_docker/Dockerfile | 6 ++-- 9 files changed, 32 insertions(+), 43 deletions(-) diff --git a/api_auth_docker/Dockerfile b/api_auth_docker/Dockerfile index ab22ed9..aa178dc 100644 --- a/api_auth_docker/Dockerfile +++ b/api_auth_docker/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:alpine +FROM nginx:1.18.0-alpine RUN apk add --update --no-cache \ bash \ diff --git a/cron_docker/Dockerfile b/cron_docker/Dockerfile index 44eb442..f9710d0 100644 --- a/cron_docker/Dockerfile +++ b/cron_docker/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM alpine:3.12.4 RUN apk add --update --no-cache \ curl diff --git a/cyphernodeconf_docker/Dockerfile b/cyphernodeconf_docker/Dockerfile index 9698fe2..df64a55 100644 --- a/cyphernodeconf_docker/Dockerfile +++ b/cyphernodeconf_docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13-alpine3.10 as builder-torgen +FROM golang:1.13.15-alpine3.12 as builder-torgen RUN apk add git build-base @@ -13,7 +13,7 @@ RUN go get RUN go build torgen.go RUN chmod +x /go/src/torgen/torgen -FROM alpine:3.11.0 as builder-qrencode +FROM alpine:3.12.4 as builder-qrencode RUN apk add --update --no-cache \ autoconf \ @@ -30,7 +30,7 @@ RUN git clone -b v4.1.0 https://github.com/fukuchi/libqrencode.git \ && make \ && make install -FROM node:12.2.0-alpine +FROM node:15.11.0-alpine3.12 ENV EDITOR=/usr/bin/nano diff --git a/cyphernodeconf_docker/templates/installer/testfeatures.sh b/cyphernodeconf_docker/templates/installer/testfeatures.sh index 627c62f..5831922 100644 --- a/cyphernodeconf_docker/templates/installer/testfeatures.sh +++ b/cyphernodeconf_docker/templates/installer/testfeatures.sh @@ -128,7 +128,8 @@ checktor() { echo -en "\r\n\e[1;36mTesting Tor... " > /dev/console local rc - rc=$(curl -s -o /dev/null -w "%{http_code}" --socks5-hostname tor:9050 http://expyuzz4wqqyqhjn.onion/) + # Testing with onion.torproject.org hidden service. + rc=$(curl -s -o /dev/null -w "%{http_code}" --socks5-hostname tor:9050 http://yz7lpwfhhzcdyc5y.onion/) [ "${rc}" -ne "200" ] && return 250 echo -e "\e[1;36mTor rocks!" > /dev/console diff --git a/dist/setup.sh b/dist/setup.sh index 1e73c09..c803b22 100755 --- a/dist/setup.sh +++ b/dist/setup.sh @@ -510,26 +510,20 @@ install_docker() { if [[ $FEATURE_LIGHTNING == true ]]; then if [[ $LIGHTNING_IMPLEMENTATION == "c-lightning" ]]; then - local dockerfile="Dockerfile" - if [[ $archpath == "rpi" ]]; then - dockerfile="Dockerfile-alpine" - fi + if [ ! -d $LIGHTNING_DATAPATH/bitcoin ]; then + step " create $LIGHTNING_DATAPATH" + sudo_if_required mkdir -p $LIGHTNING_DATAPATH/bitcoin + next + fi - if [ ! -d $LIGHTNING_DATAPATH/bitcoin ]; then - step " create $LIGHTNING_DATAPATH" - sudo_if_required mkdir -p $LIGHTNING_DATAPATH/bitcoin - next - fi - - copy_file $cyphernodeconf_filepath/lightning/c-lightning/config $LIGHTNING_DATAPATH/config 1 $SUDO_REQUIRED - copy_file $cyphernodeconf_filepath/lightning/c-lightning/entrypoint.sh $LIGHTNING_DATAPATH/bitcoin/entrypoint.sh 1 $SUDO_REQUIRED - - if [[ ! -x $LIGHTNING_DATAPATH/bitcoin/entrypoint.sh ]]; then - step " make entrypoint.sh executable" - sudo_if_required chmod +x $LIGHTNING_DATAPATH/bitcoin/entrypoint.sh - next - fi + copy_file $cyphernodeconf_filepath/lightning/c-lightning/config $LIGHTNING_DATAPATH/config 1 $SUDO_REQUIRED + copy_file $cyphernodeconf_filepath/lightning/c-lightning/entrypoint.sh $LIGHTNING_DATAPATH/bitcoin/entrypoint.sh 1 $SUDO_REQUIRED + if [[ ! -x $LIGHTNING_DATAPATH/bitcoin/entrypoint.sh ]]; then + step " make entrypoint.sh executable" + sudo_if_required chmod +x $LIGHTNING_DATAPATH/bitcoin/entrypoint.sh + next + fi fi fi @@ -838,8 +832,8 @@ PROXYCRON_VERSION="v0.6.0-dev" OTSCLIENT_VERSION="v0.6.0-dev" PYCOIN_VERSION="v0.6.0-dev" CYPHERAPPS_VERSION="dev" -BITCOIN_VERSION="v0.20.1" -LIGHTNING_VERSION="v0.9.1" +BITCOIN_VERSION="v0.21.0" +LIGHTNING_VERSION="v0.9.3" TRAEFIK_VERSION="v1.7.9-alpine" MOSQUITTO_VERSION="1.6" diff --git a/otsclient_docker/Dockerfile b/otsclient_docker/Dockerfile index 7270774..7cce253 100644 --- a/otsclient_docker/Dockerfile +++ b/otsclient_docker/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 as builder +FROM alpine:3.12.4 as builder RUN apk add --no-cache --update alpine-sdk bsd-compat-headers \ && git clone https://github.com/Kexkey/proxychains-ng.git @@ -9,18 +9,12 @@ RUN cd /proxychains-ng \ && make install \ && make install-config -FROM node:11.1-alpine +FROM node:15.11.0-alpine3.12 RUN apk add --update --no-cache \ - git \ jq \ su-exec \ - && git clone https://github.com/opentimestamps/javascript-opentimestamps.git \ - && cd javascript-opentimestamps \ -# Handle 'Error: could not get uid/gid' -# See: https://github.com/npm/uid-number/issues/3 - && npm config set unsafe-perm true \ - && npm install -g + && npm install -g opentimestamps WORKDIR /script diff --git a/proxy_docker/Dockerfile b/proxy_docker/Dockerfile index 334a96f..33c5538 100644 --- a/proxy_docker/Dockerfile +++ b/proxy_docker/Dockerfile @@ -1,4 +1,4 @@ -FROM cyphernode/alpine-glibc-base:v3.11.0_2.29-0 +FROM cyphernode/alpine-glibc-base:v3.12.4_2.33-0 ENV HOME /proxy @@ -12,7 +12,7 @@ WORKDIR ${HOME} COPY app/data/* ./ COPY app/script/* ./ -COPY --from=cyphernode/clightning:v0.9.1 /usr/local/bin/lightning-cli ./ +COPY --from=cyphernode/clightning:v0.9.3 /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/ diff --git a/pycoin_docker/Dockerfile b/pycoin_docker/Dockerfile index 32b820b..9b9b484 100644 --- a/pycoin_docker/Dockerfile +++ b/pycoin_docker/Dockerfile @@ -1,12 +1,12 @@ -FROM python:3.6-alpine3.8 +FROM python:3.8.6-alpine3.12 ENV HOME /pycoin RUN apk add --update --no-cache git jq su-exec \ && cd / \ && git clone https://github.com/Kexkey/pycoin.git \ - && mkdir /usr/local/lib/python3.6/site-packages/pycoin \ - && cp -rf pycoin/pycoin/* /usr/local/lib/python3.6/site-packages/pycoin \ + && mkdir /usr/local/lib/python3.8/site-packages/pycoin \ + && cp -rf pycoin/pycoin/* /usr/local/lib/python3.8/site-packages/pycoin \ && rm -rf pycoin/* COPY script/pycoin.sh ${HOME}/pycoin.sh diff --git a/tor_docker/Dockerfile b/tor_docker/Dockerfile index 45fd86d..bde5e96 100644 --- a/tor_docker/Dockerfile +++ b/tor_docker/Dockerfile @@ -1,6 +1,6 @@ -FROM alpine:3.12 AS builder +FROM alpine:3.12.4 AS builder -ARG TOR_VER=0.4.4.5 +ARG TOR_VER=0.4.5.6 ARG TORGZ=https://dist.torproject.org/tor-$TOR_VER.tar.gz RUN apk --no-cache add --update \ @@ -17,7 +17,7 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 0xFE43009C4607B1FB 0x6AF && tar xfz tor-$TOR_VER.tar.gz && cd tor-$TOR_VER \ && ./configure && make install -FROM alpine:3.12 +FROM alpine:3.12.4 RUN apk --no-cache add --update \ su-exec