From 12e3666db0cf34b7d2e5f36730e04f251342c783 Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Thu, 6 Aug 2020 11:05:40 +0100
Subject: [PATCH] test: squid:4

---
 .drone/drone-home.jsonnet | 10 ++++-----
 .drone/drone-home.yml     | 45 +++++++++++++++++++++++++++------------
 squid-4/Dockerfile        |  2 +-
 3 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/.drone/drone-home.jsonnet b/.drone/drone-home.jsonnet
index 2fd0ed5..288bdbb 100644
--- a/.drone/drone-home.jsonnet
+++ b/.drone/drone-home.jsonnet
@@ -49,7 +49,7 @@ local publicSecrets = import 'lib/public-secrets.libsonnet';
         '/stack/squid'
       ),
       images.wait(15),
-      images.docker {
+      /*images.docker {
         name +: 'build docker image:',
         environment +: environment.environmentSecrets([
           'LOCAL_DOCKER_REGISTRY',
@@ -68,10 +68,10 @@ local publicSecrets = import 'lib/public-secrets.libsonnet';
           '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',
+          'docker push $${LOCAL_DOCKER_REGISTRY}squid-4',
           'docker logout $${LOCAL_DOCKER_REGISTRY}',
         ],
-      },/*
+      },
       images.docker {
         name +: 'build docker image:',
         environment +: environment.environmentSecrets([
@@ -94,7 +94,7 @@ local publicSecrets = import 'lib/public-secrets.libsonnet';
           'docker push $${LOCAL_DOCKER_REGISTRY}squid',
           'docker logout $${LOCAL_DOCKER_REGISTRY}',
         ],
-      } */ /*
+      } */
       compose([
         environment.envSet('local-docker-registry'),
         environment.envSet('local-registry-password'),
@@ -119,7 +119,7 @@ local publicSecrets = import 'lib/public-secrets.libsonnet';
             ]
           }
         },
-      ),*/
+      ),
     ],
   }
 ]
diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml
index 7307127..06ee2c2 100644
--- a/.drone/drone-home.yml
+++ b/.drone/drone-home.yml
@@ -29,25 +29,42 @@ steps:
   commands:
   - sleep 15
 
-- name: "dockerbuild docker image:"
-  image: docker:dind
-  commands:
-  - 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
-  - docker logout $${LOCAL_DOCKER_REGISTRY}
+- name: deploy squid
+  image: appleboy/drone-ssh
+  settings:
+    envs:
+    - drone_tag
+    - drone_commit
+    - drone_build_number
+    - drone_repo_name
+    - drone_repo_namespace
+    - local_docker_registry
+    - local_registry_password
+    host:
+      from_secret: ssh-host
+    key:
+      from_secret: ssh-key
+    port:
+      from_secret: ssh-port
+    script:
+    - set -e
+    - docker network prune -f
+    - cd /stack/squid/myCA
+    - cd ..
+    - docker stack rm squid
+    - 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 pull $${SQUID_IMAGE}
+    - docker stack deploy -c docker-compose.yml squid
+    username:
+      from_secret: ssh-user
   environment:
     LOCAL_DOCKER_REGISTRY:
       from_secret: local-docker-registry
     LOCAL_REGISTRY_PASSWORD:
       from_secret: local-registry-password
-  volumes:
-  - name: dockersock
-    path: /var/run
 
 services:
 - name: docker
diff --git a/squid-4/Dockerfile b/squid-4/Dockerfile
index d12ffd4..8a2d15f 100644
--- a/squid-4/Dockerfile
+++ b/squid-4/Dockerfile
@@ -1,6 +1,6 @@
 ARG DOCKER_PREFIX=
 
-FROM ${DOCKER_PREFIX}ubuntu:artful
+FROM ${DOCKER_PREFIX}ubuntu:xenial
 
 ARG TRUST_CERT=