From 822a9c0550c88c3bbe4da7b244ca731f08ed1b9d Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Thu, 6 Aug 2020 16:33:26 +0100
Subject: [PATCH] test: squid:4

---
 .drone/drone-home.jsonnet | 18 ++++++++++--------
 .drone/drone-home.yml     | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/.drone/drone-home.jsonnet b/.drone/drone-home.jsonnet
index 18e244a..75c1e32 100644
--- a/.drone/drone-home.jsonnet
+++ b/.drone/drone-home.jsonnet
@@ -67,7 +67,7 @@ local util = import 'lib/util.libsonnet';
         '/stack/squid'
       ),
       images.wait(15),
-      /*images.docker {
+      images.docker {
         name +: 'build docker image:',
         environment +: environment.environmentSecrets([
           'LOCAL_DOCKER_REGISTRY',
@@ -83,13 +83,15 @@ local util = import 'lib/util.libsonnet';
           'set -e',
           'pwd',
           'sleep 15',
-          'cd squid-4',
-          'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"',
-          'docker build . -t $${LOCAL_DOCKER_REGISTRY}squid-4',
-          'docker push $${LOCAL_DOCKER_REGISTRY}squid-4',
-          'docker logout $${LOCAL_DOCKER_REGISTRY}',
+          'export SQUID_IMAGE=$${LOCAL_DOCKER_REGISTRY}squid',
+          'docker pull $${SQUID_IMAGE}',
+              
+          //'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"',
+          //'docker build . -t $${LOCAL_DOCKER_REGISTRY}squid-4',
+          //'docker push $${LOCAL_DOCKER_REGISTRY}squid-4',
+          //'docker logout $${LOCAL_DOCKER_REGISTRY}',
         ],
-      },
+      }, /*
       images.docker {
         name +: 'build docker image:',
         environment +: environment.environmentSecrets([
@@ -137,7 +139,7 @@ local util = import 'lib/util.libsonnet';
               //"sleep 60",
               // "docker volume rm squid_squid-cache",
               'export SQUID_IMAGE=$${LOCAL_DOCKER_REGISTRY}squid',
-              //'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"',
+              'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"',
               'docker pull $${SQUID_IMAGE}',
               "docker stack deploy -c docker-compose.yml squid",
             ]
diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml
index 58b4882..c52fc8e 100644
--- a/.drone/drone-home.yml
+++ b/.drone/drone-home.yml
@@ -70,6 +70,23 @@ steps:
   commands:
   - sleep 15
 
+- name: "dockerbuild docker image:"
+  image: docker:dind
+  commands:
+  - set -e
+  - pwd
+  - sleep 15
+  - export SQUID_IMAGE=$${LOCAL_DOCKER_REGISTRY}squid
+  - docker pull $${SQUID_IMAGE}
+  environment:
+    LOCAL_DOCKER_REGISTRY:
+      from_secret: local-docker-registry
+    LOCAL_REGISTRY_PASSWORD:
+      from_secret: local-registry-password
+  volumes:
+  - name: dockersock
+    path: /var/run
+
 - name: deploy squid
   image: appleboy/drone-ssh
   settings:
@@ -98,6 +115,7 @@ steps:
     - cd /stack/squid/myCA
     - cd ..
     - export SQUID_IMAGE=$${LOCAL_DOCKER_REGISTRY}squid
+    - docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}"
     - docker pull $${SQUID_IMAGE}
     - docker stack deploy -c docker-compose.yml squid
     username: