diff --git a/build.sh b/build.sh index bdfe74e..7052426 100755 --- a/build.sh +++ b/build.sh @@ -2,15 +2,15 @@ TRACING=1 -# CYPHERNODE VERSION "v0.7.0-rc.2" -CONF_VERSION="v0.7.0-rc.2-local" -GATEKEEPER_VERSION="v0.7.0-rc.2-local" -TOR_VERSION="v0.7.0-rc.2-local" -PROXY_VERSION="v0.7.0-rc.2-local" -NOTIFIER_VERSION="v0.7.0-rc.2-local" -PROXYCRON_VERSION="v0.7.0-rc.2-local" -OTSCLIENT_VERSION="v0.7.0-rc.2-local" -PYCOIN_VERSION="v0.7.0-rc.2-local" +# CYPHERNODE VERSION "v0.7.0" +CONF_VERSION="v0.7.0-local" +GATEKEEPER_VERSION="v0.7.0-local" +TOR_VERSION="v0.7.0-local" +PROXY_VERSION="v0.7.0-local" +NOTIFIER_VERSION="v0.7.0-local" +PROXYCRON_VERSION="v0.7.0-local" +OTSCLIENT_VERSION="v0.7.0-local" +PYCOIN_VERSION="v0.7.0-local" trace() { diff --git a/cyphernodeconf_docker/build.sh b/cyphernodeconf_docker/build.sh deleted file mode 100755 index d2ab8b7..0000000 --- a/cyphernodeconf_docker/build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -VERSION=v0.7.0-rc.2 - -docker build . -t cyphernode/cyphernodeconf:${VERSION} diff --git a/cyphernodeconf_docker/run.sh b/cyphernodeconf_docker/run.sh deleted file mode 100755 index b293725..0000000 --- a/cyphernodeconf_docker/run.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -export SETUP_DIR=$(pwd)/../dist -export DEFAULT_USER=$USER -export DEFAULT_CERT_HOSTNAME=disk0book.local -export PROXYCRON_VERSION=v0.7.0-rc.2 -export PYCOIN_VERSION=v0.7.0-rc.2 -export SETUP_VERSION=v0.7.0-rc.2 -export BITCOIN_VERSION=v0.21.1 -export LIGHTNING_VERSION=v0.10.0 -export DEFAULT_DATADIR_BASE=$HOME -export GATEKEEPER_VERSION=v0.7.0-rc.2 -export TOR_VERSION=v0.7.0-rc.2 -export PROXY_VERSION=v0.7.0-rc.2 -export OTSCLIENT_VERSION=v0.7.0-rc.2 -export NOTIFIER_VERSION=v0.7.0-rc.2 -export EDITOR=/usr/bin/nano -export TRAEFIK_VERSION="v1.7.9-alpine" -export MOSQUITTO_VERSION="1.6" - -user=$(id -u):$(id -g) - -if [ "${MODE}" = 'docker' ]; then - docker build . -t cyphernodeconf:local - docker run -v $(pwd)/testinst:/data \ - -e DEFAULT_USER=jash \ - -e DEFAULT_DATADIR_BASE=$HOME \ - -e SETUP_DIR=$SETUP_DIR \ - -e DEFAULT_CERT_HOSTNAME=$(hostname) \ - -e GATEKEEPER_VERSION=$GATEKEEPER_VERSION \ - -e TRAEFIK_VERSION=$TRAEFIK_VERSION \ - -e MOSQUITTO_VERSION=$MOSQUITTO_VERSION \ - -e TOR_VERSION=$TOR_VERSION \ - -e PROXY_VERSION=$PROXY_VERSION \ - -e NOTIFIER_VERSION=$NOTIFIER_VERSION \ - -e PROXYCRON_VERSION=$PROXYCRON_VERSION \ - -e OTSCLIENT_VERSION=$OTSCLIENT_VERSION \ - -e PYCOIN_VERSION=$PYCOIN_VERSION \ - -e BITCOIN_VERSION=$BITCOIN_VERSION \ - -e LIGHTNING_VERSION=$LIGHTNING_VERSION \ - -e SETUP_VERSION=$SETUP_VERSION \ - -e DEFAULT_USER=$DEFAULT_USER \ - --log-driver=none \ - --network none \ - --rm -it cyphernodeconf:local $user node index.js $@ -else - /usr/local/bin/node index.js $@ -fi diff --git a/dist/setup.sh b/dist/setup.sh index 336c38e..0338da0 100755 --- a/dist/setup.sh +++ b/dist/setup.sh @@ -849,17 +849,17 @@ ALWAYSYES=0 SUDO_REQUIRED=0 AUTOSTART=0 -# CYPHERNODE VERSION "v0.7.0-rc.2" -SETUP_VERSION="v0.7.0-rc.2" -CONF_VERSION="v0.7.0-rc.2" -GATEKEEPER_VERSION="v0.7.0-rc.2" -TOR_VERSION="v0.7.0-rc.2" -PROXY_VERSION="v0.7.0-rc.2" -NOTIFIER_VERSION="v0.7.0-rc.2" -PROXYCRON_VERSION="v0.7.0-rc.2" -OTSCLIENT_VERSION="v0.7.0-rc.2" -PYCOIN_VERSION="v0.7.0-rc.2" -CYPHERAPPS_VERSION="releases/v0.7.0" +# CYPHERNODE VERSION "v0.7.0" +SETUP_VERSION="v0.7.0" +CONF_VERSION="v0.7.0" +GATEKEEPER_VERSION="v0.7.0" +TOR_VERSION="v0.7.0" +PROXY_VERSION="v0.7.0" +NOTIFIER_VERSION="v0.7.0" +PROXYCRON_VERSION="v0.7.0" +OTSCLIENT_VERSION="v0.7.0" +PYCOIN_VERSION="v0.7.0" +CYPHERAPPS_VERSION="v0.7.0" BITCOIN_VERSION="v0.21.1" LIGHTNING_VERSION="v0.10.0" TRAEFIK_VERSION="v1.7.9-alpine" diff --git a/docker-build.sh b/docker-build.sh index 0a1b696..83d53cf 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -65,9 +65,9 @@ aarch64_docker="arm64" #arch_docker=${aarch64_docker} arch_docker=${x86_docker} -v1="v0-rc.2" -v2="v0.7-rc.2" -v3="v0.7.0-rc.2" +v1="v0" +v2="v0.7" +v3="v0.7.0" echo "\nBuilding Cyphernode Core containers\n" echo "arch_docker=$arch_docker\n"