From 7d1085d581e0325949a91b882abf907986e62d04 Mon Sep 17 00:00:00 2001
From: richard <r_morgan@sympatico.ca>
Date: Sun, 12 Jan 2020 22:27:24 -0500
Subject: [PATCH] update launch scripts to use a password.txt file instead of
 environment variable.

---
 .gitignore                                    |  3 +-
 dockerfiles/services/launch_apps.sh           | 46 ++++++++++---------
 dockerfiles/services/open_portal.sh           |  3 ++
 .../services/services/launch_services.sh      |  3 +-
 4 files changed, 31 insertions(+), 24 deletions(-)
 create mode 100644 dockerfiles/services/open_portal.sh

diff --git a/.gitignore b/.gitignore
index e9c83c8..1a46eb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,5 @@ backups/
 roles/vendor/
 /dockerfiles/services/nextcloud/config/config.php
 
-!.idea/
\ No newline at end of file
+!.idea/
+password.txt
diff --git a/dockerfiles/services/launch_apps.sh b/dockerfiles/services/launch_apps.sh
index b2112b7..21c7d37 100644
--- a/dockerfiles/services/launch_apps.sh
+++ b/dockerfiles/services/launch_apps.sh
@@ -2,35 +2,37 @@
 trap "echo Booh!" SIGINT SIGTERM
 
 export DOCKER_HOST=dkmanager:2376
+DKREGISTRY=dkregistry.xai-corp.net:5000
 
 scale_out() {
-    REPLICA_COUNT=`docker service inspect $1 | jq '.[0].Spec.Mode.Replicated.Replicas'`
-    ./timeout.sh -t $2 docker service scale $1=$(($REPLICA_COUNT*2))
-    ./timeout.sh -t $2 docker service scale $1=$(($REPLICA_COUNT))
-    docker service update -q $1
+    REPLICA_COUNT=$(docker service inspect $1 | jq '.[0].Spec.Mode.Replicated.Replicas')
+    ./timeout.sh -t "$2" docker service scale $1=$(($REPLICA_COUNT*2))
+    ./timeout.sh -t "$2" docker service scale $1=$(($REPLICA_COUNT))
+    docker service update -q "$1"
 }
 
 
-docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY
+#docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY
+< ./password.txt docker login --username richard --password-stdin  $DKREGISTRY
 
-docker stack deploy --with-registry-auth --prune -c gitea/docker-compose.yml gitea
-scale_out gitea_app 180
-
-docker stack deploy --with-registry-auth --prune -c nextcloud/docker-compose-prod.yml xaibox
-scale_out xaibox_app 180
-
-docker stack deploy --with-registry-auth --prune -c ui/docker-compose.yml dkui
-scale_out dkui_app 180
-
-docker stack deploy --with-registry-auth --prune -c jenkins/docker-compose.yml jenkins
-scale_out jenkins_app 180
-
-#docker stack deploy --with-registry-auth --prune -c letsencrypt/docker-compose-update.yml letsencrypt
-
-docker stack deploy --with-registry-auth --prune -c prometheus/docker-compose-prod.yml metrics
+docker stack deploy --with-registry-auth -c gitea/docker-compose.yml gitea &
+docker stack deploy --with-registry-auth -c nextcloud/docker-compose-prod.yml xaibox &
+docker stack deploy --with-registry-auth -c ui/docker-compose.yml dkui &
+docker stack deploy --with-registry-auth -c jenkins/docker-compose.yml jenkins &
+docker stack deploy --with-registry-auth -c letsencrypt/docker-compose-update.yml letsencrypt &
+#docker stack deploy --with-registry-auth -c prometheus/docker-compose-prod.yml metrics &
 
+wait
 sleep 5
 
-docker stack deploy --with-registry-auth --prune -c sslproxy/docker-compose-prod.yml sslproxy
-scale_out sslproxy_app 30
+docker stack deploy --with-registry-auth -c sslproxy/docker-compose-prod.yml sslproxy
+
+
+scale_out gitea_app 180 &
+scale_out xaibox_app 180 &
+scale_out dkui_app 180 &
+scale_out jenkins_app 180 &
+scale_out sslproxy_app 30 &
+
+wait
 
diff --git a/dockerfiles/services/open_portal.sh b/dockerfiles/services/open_portal.sh
new file mode 100644
index 0000000..7dbfb0e
--- /dev/null
+++ b/dockerfiles/services/open_portal.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+xdg-open https://dkui.xai-corp.net/
diff --git a/dockerfiles/services/services/launch_services.sh b/dockerfiles/services/services/launch_services.sh
index 44a5c72..106b068 100755
--- a/dockerfiles/services/services/launch_services.sh
+++ b/dockerfiles/services/services/launch_services.sh
@@ -3,6 +3,7 @@
 
 export DOCKER_HOST=dkmanager:2376
 
+DKREGISTRY=dkregistry.xai-corp.net:5000
 CONFIG=stack.tmp.yml
 SERVICE=services
 #NETWORK=prod
@@ -16,7 +17,7 @@ scale_out() {
 
 docker stack deploy -c dkregistry/docker-compose.yml $SERVICE
 docker service update -q services_registry
-docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY
+< ../password.txt docker login --username richard --password-stdin $DKREGISTRY
 
 docker-compose \
     -f network.yml \