mirror of
https://github.com/aljazceru/cyphernode.git
synced 2025-12-17 04:35:14 +01:00
Upgraded versions: Alpine, Bitcoin Core, C-Lightning, etc.
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
FROM nginx:alpine
|
FROM nginx:1.18.0-alpine
|
||||||
|
|
||||||
RUN apk add --update --no-cache \
|
RUN apk add --update --no-cache \
|
||||||
bash \
|
bash \
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.8
|
FROM alpine:3.12.4
|
||||||
|
|
||||||
RUN apk add --update --no-cache \
|
RUN apk add --update --no-cache \
|
||||||
curl
|
curl
|
||||||
|
|||||||
@@ -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
|
RUN apk add git build-base
|
||||||
|
|
||||||
@@ -13,7 +13,7 @@ RUN go get
|
|||||||
RUN go build torgen.go
|
RUN go build torgen.go
|
||||||
RUN chmod +x /go/src/torgen/torgen
|
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 \
|
RUN apk add --update --no-cache \
|
||||||
autoconf \
|
autoconf \
|
||||||
@@ -30,7 +30,7 @@ RUN git clone -b v4.1.0 https://github.com/fukuchi/libqrencode.git \
|
|||||||
&& make \
|
&& make \
|
||||||
&& make install
|
&& make install
|
||||||
|
|
||||||
FROM node:12.2.0-alpine
|
FROM node:15.11.0-alpine3.12
|
||||||
|
|
||||||
ENV EDITOR=/usr/bin/nano
|
ENV EDITOR=/usr/bin/nano
|
||||||
|
|
||||||
|
|||||||
@@ -128,7 +128,8 @@ checktor() {
|
|||||||
echo -en "\r\n\e[1;36mTesting Tor... " > /dev/console
|
echo -en "\r\n\e[1;36mTesting Tor... " > /dev/console
|
||||||
local rc
|
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
|
[ "${rc}" -ne "200" ] && return 250
|
||||||
|
|
||||||
echo -e "\e[1;36mTor rocks!" > /dev/console
|
echo -e "\e[1;36mTor rocks!" > /dev/console
|
||||||
|
|||||||
34
dist/setup.sh
vendored
34
dist/setup.sh
vendored
@@ -510,26 +510,20 @@ install_docker() {
|
|||||||
|
|
||||||
if [[ $FEATURE_LIGHTNING == true ]]; then
|
if [[ $FEATURE_LIGHTNING == true ]]; then
|
||||||
if [[ $LIGHTNING_IMPLEMENTATION == "c-lightning" ]]; then
|
if [[ $LIGHTNING_IMPLEMENTATION == "c-lightning" ]]; then
|
||||||
local dockerfile="Dockerfile"
|
if [ ! -d $LIGHTNING_DATAPATH/bitcoin ]; then
|
||||||
if [[ $archpath == "rpi" ]]; then
|
step " [32mcreate[0m $LIGHTNING_DATAPATH"
|
||||||
dockerfile="Dockerfile-alpine"
|
sudo_if_required mkdir -p $LIGHTNING_DATAPATH/bitcoin
|
||||||
fi
|
next
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ! -d $LIGHTNING_DATAPATH/bitcoin ]; then
|
copy_file $cyphernodeconf_filepath/lightning/c-lightning/config $LIGHTNING_DATAPATH/config 1 $SUDO_REQUIRED
|
||||||
step " [32mcreate[0m $LIGHTNING_DATAPATH"
|
copy_file $cyphernodeconf_filepath/lightning/c-lightning/entrypoint.sh $LIGHTNING_DATAPATH/bitcoin/entrypoint.sh 1 $SUDO_REQUIRED
|
||||||
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 " [32mmake[0m entrypoint.sh executable"
|
|
||||||
sudo_if_required chmod +x $LIGHTNING_DATAPATH/bitcoin/entrypoint.sh
|
|
||||||
next
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
if [[ ! -x $LIGHTNING_DATAPATH/bitcoin/entrypoint.sh ]]; then
|
||||||
|
step " [32mmake[0m entrypoint.sh executable"
|
||||||
|
sudo_if_required chmod +x $LIGHTNING_DATAPATH/bitcoin/entrypoint.sh
|
||||||
|
next
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -838,8 +832,8 @@ PROXYCRON_VERSION="v0.6.0-dev"
|
|||||||
OTSCLIENT_VERSION="v0.6.0-dev"
|
OTSCLIENT_VERSION="v0.6.0-dev"
|
||||||
PYCOIN_VERSION="v0.6.0-dev"
|
PYCOIN_VERSION="v0.6.0-dev"
|
||||||
CYPHERAPPS_VERSION="dev"
|
CYPHERAPPS_VERSION="dev"
|
||||||
BITCOIN_VERSION="v0.20.1"
|
BITCOIN_VERSION="v0.21.0"
|
||||||
LIGHTNING_VERSION="v0.9.1"
|
LIGHTNING_VERSION="v0.9.3"
|
||||||
TRAEFIK_VERSION="v1.7.9-alpine"
|
TRAEFIK_VERSION="v1.7.9-alpine"
|
||||||
MOSQUITTO_VERSION="1.6"
|
MOSQUITTO_VERSION="1.6"
|
||||||
|
|
||||||
|
|||||||
@@ -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 \
|
RUN apk add --no-cache --update alpine-sdk bsd-compat-headers \
|
||||||
&& git clone https://github.com/Kexkey/proxychains-ng.git
|
&& git clone https://github.com/Kexkey/proxychains-ng.git
|
||||||
@@ -9,18 +9,12 @@ RUN cd /proxychains-ng \
|
|||||||
&& make install \
|
&& make install \
|
||||||
&& make install-config
|
&& make install-config
|
||||||
|
|
||||||
FROM node:11.1-alpine
|
FROM node:15.11.0-alpine3.12
|
||||||
|
|
||||||
RUN apk add --update --no-cache \
|
RUN apk add --update --no-cache \
|
||||||
git \
|
|
||||||
jq \
|
jq \
|
||||||
su-exec \
|
su-exec \
|
||||||
&& git clone https://github.com/opentimestamps/javascript-opentimestamps.git \
|
&& npm install -g opentimestamps
|
||||||
&& 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
|
|
||||||
|
|
||||||
WORKDIR /script
|
WORKDIR /script
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
ENV HOME /proxy
|
||||||
|
|
||||||
@@ -12,7 +12,7 @@ WORKDIR ${HOME}
|
|||||||
|
|
||||||
COPY app/data/* ./
|
COPY app/data/* ./
|
||||||
COPY app/script/* ./
|
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/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/libmosquitto* /usr/lib/
|
||||||
COPY --from=eclipse-mosquitto:1.6 /usr/lib/libcrypto* /usr/lib/
|
COPY --from=eclipse-mosquitto:1.6 /usr/lib/libcrypto* /usr/lib/
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
FROM python:3.6-alpine3.8
|
FROM python:3.8.6-alpine3.12
|
||||||
|
|
||||||
ENV HOME /pycoin
|
ENV HOME /pycoin
|
||||||
|
|
||||||
RUN apk add --update --no-cache git jq su-exec \
|
RUN apk add --update --no-cache git jq su-exec \
|
||||||
&& cd / \
|
&& cd / \
|
||||||
&& git clone https://github.com/Kexkey/pycoin.git \
|
&& git clone https://github.com/Kexkey/pycoin.git \
|
||||||
&& mkdir /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.6/site-packages/pycoin \
|
&& cp -rf pycoin/pycoin/* /usr/local/lib/python3.8/site-packages/pycoin \
|
||||||
&& rm -rf pycoin/*
|
&& rm -rf pycoin/*
|
||||||
|
|
||||||
COPY script/pycoin.sh ${HOME}/pycoin.sh
|
COPY script/pycoin.sh ${HOME}/pycoin.sh
|
||||||
|
|||||||
@@ -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
|
ARG TORGZ=https://dist.torproject.org/tor-$TOR_VER.tar.gz
|
||||||
|
|
||||||
RUN apk --no-cache add --update \
|
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 \
|
&& tar xfz tor-$TOR_VER.tar.gz && cd tor-$TOR_VER \
|
||||||
&& ./configure && make install
|
&& ./configure && make install
|
||||||
|
|
||||||
FROM alpine:3.12
|
FROM alpine:3.12.4
|
||||||
|
|
||||||
RUN apk --no-cache add --update \
|
RUN apk --no-cache add --update \
|
||||||
su-exec
|
su-exec
|
||||||
|
|||||||
Reference in New Issue
Block a user