From 8d6b048a8edd855eb0bbeec119c32a36b6d5ad81 Mon Sep 17 00:00:00 2001
From: kexkey <Kexkey@users.noreply.github.com>
Date: Mon, 21 Jan 2019 11:21:45 -0500
Subject: [PATCH 1/2] Delete publish.sh

---
 publish.sh | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100755 publish.sh

diff --git a/publish.sh b/publish.sh
deleted file mode 100755
index 95f8038..0000000
--- a/publish.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-ARCH=$(uname -m)
-
-docker tag cyphernodeconf registry.skp.rocks:5000/$ARCH/cyphernodeconf
-docker tag cyphernode/bitcoin registry.skp.rocks:5000/$ARCH/cyphernode/bitcoin
-docker tag cyphernode/clightning registry.skp.rocks:5000/$ARCH/cyphernode/clightning
-docker tag cyphernode/otsclient registry.skp.rocks:5000/$ARCH/cyphernode/otsclient
-docker tag cyphernode/proxy registry.skp.rocks:5000/$ARCH/cyphernode/proxy
-docker tag cyphernode/proxycron registry.skp.rocks:5000/$ARCH/cyphernode/proxycron
-docker tag cyphernode/pycoin registry.skp.rocks:5000/$ARCH/cyphernode/pycoin
-
-docker push registry.skp.rocks:5000/$ARCH/cyphernodeconf
-docker push registry.skp.rocks:5000/$ARCH/cyphernode/bitcoin
-docker push registry.skp.rocks:5000/$ARCH/cyphernode/clightning
-docker push registry.skp.rocks:5000/$ARCH/cyphernode/otsclient
-docker push registry.skp.rocks:5000/$ARCH/cyphernode/proxy
-docker push registry.skp.rocks:5000/$ARCH/cyphernode/proxycron
-docker push registry.skp.rocks:5000/$ARCH/cyphernode/pycoin

From 640b30e65a79ac8ded2a0b2350ea5a95008fb44e Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Tue, 22 Jan 2019 13:16:55 -0500
Subject: [PATCH 2/2] Docker image tags for locally built images

---
 build.sh      | 20 ++++++++++----------
 dist/setup.sh | 28 +++++++++++++++++++++-------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/build.sh b/build.sh
index a5deed5..579ad12 100755
--- a/build.sh
+++ b/build.sh
@@ -2,16 +2,16 @@
 
 TRACING=1
 
-# CYPHERNODE VERSION "v0.1"
-CONF_VERSION="v0.1"
-GATEKEEPER_VERSION="v0.1"
-PROXY_VERSION="v0.1"
-PROXYCRON_VERSION="v0.1"
-OTSCLIENT_VERSION="v0.1"
-PYCOIN_VERSION="v0.1"
+# CYPHERNODE VERSION "v0.1.1"
+CONF_VERSION="v0.1.1-local"
+GATEKEEPER_VERSION="v0.1.1-local"
+PROXY_VERSION="v0.1.1-local"
+PROXYCRON_VERSION="v0.1.1-local"
+OTSCLIENT_VERSION="v0.1.1-local"
+PYCOIN_VERSION="v0.1.1-local"
 BITCOIN_VERSION="v0.17.0"
 LIGHTNING_VERSION="v0.6.2"
-GRAFANA_VERSION="v0.1"
+GRAFANA_VERSION="v0.1.1-local"
 
 trace()
 {
@@ -64,8 +64,8 @@ build_docker_images() {
   build_docker_image install/ cyphernode/cyphernodeconf:$CONF_VERSION
 
   trace "Creating SatoshiPortal images"
-  build_docker_image install/SatoshiPortal/dockers/bitcoin-core cyphernode/bitcoin:$BITCOIN_VERSION $bitcoin_dockerfile
-  build_docker_image install/SatoshiPortal/dockers/c-lightning cyphernode/clightning:$LIGHTNING_VERSION $clightning_dockerfile
+#  build_docker_image install/SatoshiPortal/dockers/bitcoin-core cyphernode/bitcoin:$BITCOIN_VERSION $bitcoin_dockerfile
+#  build_docker_image install/SatoshiPortal/dockers/c-lightning cyphernode/clightning:$LIGHTNING_VERSION $clightning_dockerfile
 
   trace "Creating cyphernode images"
   build_docker_image api_auth_docker/ cyphernode/gatekeeper:$GATEKEEPER_VERSION
diff --git a/dist/setup.sh b/dist/setup.sh
index 592f1dd..6b55555 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -649,14 +649,14 @@ ALWAYSYES=0
 SUDO_REQUIRED=0
 AUTOSTART=0
 
-# CYPHERNODE VERSION "v0.1.0"
+# CYPHERNODE VERSION "v0.1.1"
 VERSION_OVERRIDE="true"
-CONF_VERSION="v0.1"
-GATEKEEPER_VERSION="v0.1"
-PROXY_VERSION="v0.1"
-PROXYCRON_VERSION="v0.1"
-OTSCLIENT_VERSION="v0.1"
-PYCOIN_VERSION="v0.1"
+CONF_VERSION="v0.1.1"
+GATEKEEPER_VERSION="v0.1.1"
+PROXY_VERSION="v0.1.1"
+PROXYCRON_VERSION="v0.1.1"
+OTSCLIENT_VERSION="v0.1.1"
+PYCOIN_VERSION="v0.1.1"
 BITCOIN_VERSION="v0.17.0"
 LIGHTNING_VERSION="v0.6.2"
 
@@ -703,6 +703,20 @@ while getopts ":cirhys" opt; do
   esac
 done
 
+nbbuiltimgs=$(docker images --filter=reference='cyphernode/*:*-local' | wc -l)
+if [[ $nbbuiltimgs -gt 1 ]]; then
+  read -p "Locally built Cyphernode images found!  Do you want to use them?" -n 1 -r
+
+  if [[ $REPLY =~ ^[Yy]$ ]]; then
+    CONF_VERSION="$CONF_VERSION-local"
+    GATEKEEPER_VERSION="$GATEKEEPER_VERSION-local"
+    PROXY_VERSION="$PROXY_VERSION-local"
+    PROXYCRON_VERSION="$PROXYCRON_VERSION-local"
+    OTSCLIENT_VERSION="$OTSCLIENT_VERSION-local"
+    PYCOIN_VERSION="$PYCOIN_VERSION-local"
+  fi
+fi
+
 if [[  $CONFIGURE == 0 && $INSTALL == 0 && $RECREATE == 0 ]]; then
   CONFIGURE=1
   INSTALL=1