Upgraded versions: Alpine, Bitcoin Core, C-Lightning, etc.

This commit is contained in:
kexkey
2021-03-11 14:12:45 -05:00
parent 2bf9e9050a
commit 67d51365b8
9 changed files with 32 additions and 43 deletions

View File

@@ -1,4 +1,4 @@
FROM nginx:alpine
FROM nginx:1.18.0-alpine
RUN apk add --update --no-cache \
bash \

View File

@@ -1,4 +1,4 @@
FROM alpine:3.8
FROM alpine:3.12.4
RUN apk add --update --no-cache \
curl

View File

@@ -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

View File

@@ -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

34
dist/setup.sh vendored
View File

@@ -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"

View File

@@ -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

View File

@@ -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/

View File

@@ -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

View File

@@ -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