From 4db2ac351b7569ed3e10877bd50b09d851471e8c Mon Sep 17 00:00:00 2001
From: kexkey <Kexkey@users.noreply.github.com>
Date: Wed, 17 Feb 2021 16:26:39 -0500
Subject: [PATCH] v0.6.0 (#208)

* v0.6.0-rc.1

* v0.6.0-rc.2

* v0.6.0-rc.3

* v0.6.0-rc.4

* Much smaller Tor container image

* v0.6.0
---
 build.sh                       | 18 +++++++++---------
 cyphernodeconf_docker/build.sh |  2 +-
 cyphernodeconf_docker/run.sh   | 16 ++++++++--------
 dist/setup.sh                  | 22 +++++++++++-----------
 docker-build.sh                |  4 ++--
 tor_docker/Dockerfile          | 11 ++++++++++-
 6 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/build.sh b/build.sh
index 7b7af9a..ac712d8 100755
--- a/build.sh
+++ b/build.sh
@@ -2,15 +2,15 @@
 
 TRACING=1
 
-# CYPHERNODE VERSION "v0.5.0-dev"
-CONF_VERSION="v0.5.0-dev-local"
-GATEKEEPER_VERSION="v0.5.0-dev-local"
-TOR_VERSION="v0.5.0-dev-local"
-PROXY_VERSION="v0.5.0-dev-local"
-NOTIFIER_VERSION="v0.5.0-dev-local"
-PROXYCRON_VERSION="v0.5.0-dev-local"
-OTSCLIENT_VERSION="v0.5.0-dev-local"
-PYCOIN_VERSION="v0.5.0-dev-local"
+# CYPHERNODE VERSION "v0.6.0"
+CONF_VERSION="v0.6.0-local"
+GATEKEEPER_VERSION="v0.6.0-local"
+TOR_VERSION="v0.6.0-local"
+PROXY_VERSION="v0.6.0-local"
+NOTIFIER_VERSION="v0.6.0-local"
+PROXYCRON_VERSION="v0.6.0-local"
+OTSCLIENT_VERSION="v0.6.0-local"
+PYCOIN_VERSION="v0.6.0-local"
 BITCOIN_VERSION="v0.20.1"
 LIGHTNING_VERSION="v0.9.1"
 
diff --git a/cyphernodeconf_docker/build.sh b/cyphernodeconf_docker/build.sh
index dd3e820..c7c451c 100755
--- a/cyphernodeconf_docker/build.sh
+++ b/cyphernodeconf_docker/build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-VERSION=v0.5.0-dev
+VERSION=v0.6.0
 
 docker build . -t cyphernode/cyphernodeconf:${VERSION}
diff --git a/cyphernodeconf_docker/run.sh b/cyphernodeconf_docker/run.sh
index ed47dec..8e30564 100755
--- a/cyphernodeconf_docker/run.sh
+++ b/cyphernodeconf_docker/run.sh
@@ -3,17 +3,17 @@
 export SETUP_DIR=$(pwd)/../dist
 export DEFAULT_USER=$USER
 export DEFAULT_CERT_HOSTNAME=disk0book.local
-export PROXYCRON_VERSION=v0.5.0-dev
-export PYCOIN_VERSION=v0.5.0-dev
-export SETUP_VERSION=v0.5.0-dev
+export PROXYCRON_VERSION=v0.6.0
+export PYCOIN_VERSION=v0.6.0
+export SETUP_VERSION=v0.6.0
 export BITCOIN_VERSION=v0.20.1
 export LIGHTNING_VERSION=v0.9.1
 export DEFAULT_DATADIR_BASE=$HOME
-export GATEKEEPER_VERSION=v0.5.0-dev
-export TOR_VERSION=v0.5.0-dev
-export PROXY_VERSION=v0.5.0-dev
-export OTSCLIENT_VERSION=v0.5.0-dev
-export NOTIFIER_VERSION=v0.5.0-dev
+export GATEKEEPER_VERSION=v0.6.0
+export TOR_VERSION=v0.6.0
+export PROXY_VERSION=v0.6.0
+export OTSCLIENT_VERSION=v0.6.0
+export NOTIFIER_VERSION=v0.6.0
 export EDITOR=/usr/bin/nano
 export TRAEFIK_VERSION="v1.7.9-alpine"
 export MOSQUITTO_VERSION="1.6"
diff --git a/dist/setup.sh b/dist/setup.sh
index 91396b4..c467f5f 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -827,17 +827,17 @@ ALWAYSYES=0
 SUDO_REQUIRED=0
 AUTOSTART=0
 
-# CYPHERNODE VERSION "v0.5.0-dev"
-SETUP_VERSION="v0.5.0-dev"
-CONF_VERSION="v0.5.0-dev"
-GATEKEEPER_VERSION="v0.5.0-dev"
-TOR_VERSION="v0.5.0-dev"
-PROXY_VERSION="v0.5.0-dev"
-NOTIFIER_VERSION="v0.5.0-dev"
-PROXYCRON_VERSION="v0.5.0-dev"
-OTSCLIENT_VERSION="v0.5.0-dev"
-PYCOIN_VERSION="v0.5.0-dev"
-CYPHERAPPS_VERSION="dev"
+# CYPHERNODE VERSION "v0.6.0"
+SETUP_VERSION="v0.6.0"
+CONF_VERSION="v0.6.0"
+GATEKEEPER_VERSION="v0.6.0"
+TOR_VERSION="v0.6.0"
+PROXY_VERSION="v0.6.0"
+NOTIFIER_VERSION="v0.6.0"
+PROXYCRON_VERSION="v0.6.0"
+OTSCLIENT_VERSION="v0.6.0"
+PYCOIN_VERSION="v0.6.0"
+CYPHERAPPS_VERSION="v0.6.0"
 BITCOIN_VERSION="v0.20.1"
 LIGHTNING_VERSION="v0.9.1"
 TRAEFIK_VERSION="v1.7.9-alpine"
diff --git a/docker-build.sh b/docker-build.sh
index 293ede1..181f0e8 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -66,8 +66,8 @@ aarch64_docker="arm64"
 arch_docker=${x86_docker}
 
 v1="v0"
-v2="v0.5"
-v3="v0.5.0"
+v2="v0.6"
+v3="v0.6.0"
 
 echo "\nBuilding Cyphernode Core containers\n"
 echo "arch_docker=$arch_docker\n"
diff --git a/tor_docker/Dockerfile b/tor_docker/Dockerfile
index e0f6cff..45fd86d 100644
--- a/tor_docker/Dockerfile
+++ b/tor_docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.12 AS builder
 
 ARG TOR_VER=0.4.4.5
 ARG TORGZ=https://dist.torproject.org/tor-$TOR_VER.tar.gz
@@ -17,6 +17,15 @@ 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
+
+RUN apk --no-cache add --update \
+  su-exec
+
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /lib/ /lib/
+COPY --from=builder /usr/lib/ /usr/lib/
+
 ENTRYPOINT ["su-exec"]
 
 # docker run -it --rm --network wbnet -v /home/debian/whatever/tor:/tor tor