From eb113d091d1c2ae1f35ad986d924f081d7f0e5cc Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Thu, 13 Aug 2020 12:05:28 +0100
Subject: [PATCH] fix: rename local_registry_password

---
 .drone/drone-home.jsonnet | 29 +++--------------------------
 .drone/drone-home.yml     |  6 +++---
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/.drone/drone-home.jsonnet b/.drone/drone-home.jsonnet
index bd36e78..c9cad3b 100644
--- a/.drone/drone-home.jsonnet
+++ b/.drone/drone-home.jsonnet
@@ -71,7 +71,7 @@ local util = import 'lib/util.libsonnet';
         name +: 'build docker:dind image:',
         environment +: environment.environmentSecrets([
           'LOCAL_DOCKER_REGISTRY',
-          'LOCAL_REGISTRY_PASSWORD',
+          'REGISTRY_PASSWORD',
           'CA_CRT'
         ]),
         volumes: [
@@ -82,37 +82,14 @@ local util = import 'lib/util.libsonnet';
         ],
         commands: [
           'set -e',
-          'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"',
+          'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${REGISTRY_PASSWORD}"',
           'cd docker-dind',
           'echo "$${CA_CRT}" > CA_crt.crt',
           'docker build . -t $${LOCAL_DOCKER_REGISTRY}docker:dind',
           'docker push $${LOCAL_DOCKER_REGISTRY}docker:dind',
           'docker logout $${LOCAL_DOCKER_REGISTRY}',
         ],
-      }, /*
-      images.docker {
-        name +: 'build docker image:',
-        environment +: environment.environmentSecrets([
-          'LOCAL_DOCKER_REGISTRY',
-          'LOCAL_REGISTRY_PASSWORD',
-        ]),
-        volumes: [
-          {
-            name: 'dockersock',
-            path: '/var/run',
-          },
-        ],
-        commands: [
-          'set -e',
-          'pwd',
-          'sleep 15',
-          'cd docker',
-          'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"',
-          'docker build . -t $${LOCAL_DOCKER_REGISTRY}squid',
-          'docker push $${LOCAL_DOCKER_REGISTRY}squid',
-          'docker logout $${LOCAL_DOCKER_REGISTRY}',
-        ],
-      } */
+      },
       compose([
         environment.envSet('local-docker-registry'),
         environment.envSet('registry-password'),
diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml
index 54f3449..be6a30d 100644
--- a/.drone/drone-home.yml
+++ b/.drone/drone-home.yml
@@ -74,7 +74,7 @@ steps:
   image: docker:dind
   commands:
   - set -e
-  - docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"
+  - docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${REGISTRY_PASSWORD}"
   - cd docker-dind
   - echo "$${CA_CRT}" > CA_crt.crt
   - docker build . -t $${LOCAL_DOCKER_REGISTRY}docker:dind
@@ -85,8 +85,8 @@ steps:
       from_secret: ca-crt
     LOCAL_DOCKER_REGISTRY:
       from_secret: local-docker-registry
-    LOCAL_REGISTRY_PASSWORD:
-      from_secret: local-registry-password
+    REGISTRY_PASSWORD:
+      from_secret: registry-password
   volumes:
   - name: dockersock
     path: /var/run