From cc19e18b51e2431a559d28786104609c4ff8d56d Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Wed, 5 Aug 2020 09:01:03 +0100
Subject: [PATCH] fix: deploy

---
 .drone/drone-home.jsonnet           | 56 +++++++++--------------------
 .drone/drone-home.yml               | 28 +--------------
 .drone/lib/public-secrets.libsonnet |  1 +
 .drone/lib/secret-secrets.libsonnet |  1 +
 4 files changed, 20 insertions(+), 66 deletions(-)

diff --git a/.drone/drone-home.jsonnet b/.drone/drone-home.jsonnet
index bb5b5e8..0b70e8c 100644
--- a/.drone/drone-home.jsonnet
+++ b/.drone/drone-home.jsonnet
@@ -44,46 +44,24 @@ local publicSecrets = import 'lib/public-secrets.libsonnet';
         '/stack/squid'
       ),
       images.wait(15),
-      compose(
-        std.map(
-          function(s) util.envSet(s),
-          publicSecrets + secretSecrets
-        ) + 
-        std.map(
-          function(s) function(step) step {
-            settings +: {
-              script +: [
-                
-                'export %(env)s="$${%(env)s}"' % {
-                  env: util.environment(s),
-                },
-                'echo "$${%s}"' % util.environment(s),
-              ],
-            },
-          },
-          publicSecrets + secretSecrets
-        )
-      )
-      (
-        images.ssh  {
-          name: 'deploy squid',
-          settings +: {
-            //username: util.fromSecret("ssh-root-user"),
-            //password: util.fromSecret("ssh-root-password"),
-            script +: [
-              'set -e',
-              "docker network prune -f",
-              "cd /stack/squid/myCA",
-              'openssl genrsa -out CA_key.pem 2048',
-              'openssl req -x509 -days 600 -new -nodes -key CA_key.pem -out CA_crt.pem -extensions v3_ca -config openssl.cnf    -subj "/C=US/ST=California/L=Mountain View/O=Google/OU=Enterprise/CN=MyCA"',
-              'cd ..',
-              "docker stack rm squid",
-              "sleep 30",
-              "docker stack deploy -c docker-compose.yml squid",
-            ]
-          }
+      images.ssh  {
+        name: 'deploy squid',
+        settings +: {
+          //username: util.fromSecret("ssh-root-user"),
+          //password: util.fromSecret("ssh-root-password"),
+          script +: [
+            'set -e',
+            "docker network prune -f",
+            "cd /stack/squid/myCA",
+            'openssl genrsa -out CA_key.pem 2048',
+            'openssl req -x509 -days 600 -new -nodes -key CA_key.pem -out CA_crt.pem -extensions v3_ca -config openssl.cnf    -subj "/C=US/ST=California/L=Mountain View/O=Google/OU=Enterprise/CN=MyCA"',
+            'cd ..',
+            "docker stack rm squid",
+            "sleep 31",
+            "docker stack deploy -c docker-compose.yml squid",
+          ]
         }
-      ),
+      }
     ],
   }
 ]
diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml
index 1969cc1..284e8e9 100644
--- a/.drone/drone-home.yml
+++ b/.drone/drone-home.yml
@@ -38,11 +38,6 @@ steps:
     - drone_build_number
     - drone_repo_name
     - drone_repo_namespace
-    - ssh_host
-    - ssh_user
-    - ssh_root_user
-    - ssh_password
-    - ssh_key
     host:
       from_secret: ssh-host
     key:
@@ -57,31 +52,10 @@ steps:
     - openssl req -x509 -days 600 -new -nodes -key CA_key.pem -out CA_crt.pem -extensions v3_ca -config openssl.cnf    -subj "/C=US/ST=California/L=Mountain View/O=Google/OU=Enterprise/CN=MyCA"
     - cd ..
     - docker stack rm squid
-    - sleep 30
+    - sleep 31
     - docker stack deploy -c docker-compose.yml squid
-    - export SSH_HOST="$${SSH_HOST}"
-    - echo "$${SSH_HOST}"
-    - export SSH_USER="$${SSH_USER}"
-    - echo "$${SSH_USER}"
-    - export SSH_ROOT_USER="$${SSH_ROOT_USER}"
-    - echo "$${SSH_ROOT_USER}"
-    - export SSH_PASSWORD="$${SSH_PASSWORD}"
-    - echo "$${SSH_PASSWORD}"
-    - export SSH_KEY="$${SSH_KEY}"
-    - echo "$${SSH_KEY}"
     username:
       from_secret: ssh-user
-  environment:
-    SSH_HOST:
-      from_secret: ssh-host
-    SSH_KEY:
-      from_secret: ssh-key
-    SSH_PASSWORD:
-      from_secret: ssh-password
-    SSH_ROOT_USER:
-      from_secret: ssh-root-user
-    SSH_USER:
-      from_secret: ssh-user
 
 services:
 - name: docker
diff --git a/.drone/lib/public-secrets.libsonnet b/.drone/lib/public-secrets.libsonnet
index 37e5556..e7e223c 100644
--- a/.drone/lib/public-secrets.libsonnet
+++ b/.drone/lib/public-secrets.libsonnet
@@ -2,4 +2,5 @@
   'ssh-host',
   'ssh-user',
   'ssh-root-user',
+  'local-docker-registry',
 ]
diff --git a/.drone/lib/secret-secrets.libsonnet b/.drone/lib/secret-secrets.libsonnet
index 63b1d2d..760fb48 100644
--- a/.drone/lib/secret-secrets.libsonnet
+++ b/.drone/lib/secret-secrets.libsonnet
@@ -1,4 +1,5 @@
 [
   'ssh-password',
   'ssh-key',
+  'local-registry-password',
 ]