From ea90a7cd274298e10de6c61a034ee89b4181dba4 Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Thu, 22 Oct 2020 16:57:27 +0100
Subject: [PATCH] .

---
 .drone/drone-home.yml | 71 ++++++++++++++++++++++++++++++++++---------
 .drone/package.json   |  2 +-
 .drone/yarn.lock      |  8 ++---
 3 files changed, 61 insertions(+), 20 deletions(-)

diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml
index a4e1617..e05ba9c 100644
--- a/.drone/drone-home.yml
+++ b/.drone/drone-home.yml
@@ -15,6 +15,57 @@ trigger:
     exclude:
     - promote
 
+---
+kind: pipeline
+type: docker
+name: registry
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: "dockerpull and save docker images:"
+  image: docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f
+  commands:
+  - set -e
+  - export REGISTRY=$${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/
+  - sh .drone/scripts/initialise-images.sh $${REGISTRY} "$${REGISTRY_PASSWORD}"
+  volumes:
+  - name: dockersock
+    path: /var/run
+
+services:
+- name: docker
+  image: docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f
+  privileged: true
+  volumes:
+  - name: dockersock
+    path: /var/run
+  - name: ca
+    path: /etc/docker/certs.d
+  - name: daemonjson
+    path: /etc/docker/daemon.json
+
+volumes:
+- name: dockersock
+  temp: {}
+- name: ca
+  host:
+    path: /etc/docker/certs.d
+- name: daemonjson
+  host:
+    path: /etc/docker/daemon.json
+
+image_pull_secrets:
+- dockerconfigjson
+
+trigger:
+  event:
+  - promote
+  target:
+  - registry
+
 ---
 kind: pipeline
 type: docker
@@ -34,26 +85,16 @@ steps:
     - drone_build_number
     - drone_repo_name
     - drone_repo_namespace
-    host: ${SSH_HOST}
-    key: ${SSH_KEY}
-    passphrase: ${SSH_PASSPHRASE}
-    port: ${SSH_PORT}
     script:
     - rm -f env-portainer
-    username: ${SSH_USER}
 
 - name: scp
   image: appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47
   settings:
     command_timeout: 2m
-    host: ${SSH_HOST}
-    key: ${SSH_KEY}
-    passphrase: ${SSH_PASSPHRASE}
-    port: ${SSH_PORT}
     source:
     - .
     target: /stack/portainer
-    username: ${SSH_USER}
 
 - name: wait
   image: alpine:3.12.0@sha256:90baa0922fe90624b05cb5766fa5da4e337921656c2f8e2b13bd3c052a0baac1
@@ -85,10 +126,6 @@ steps:
     - registry_domain
     - registry_port
     - registry_password
-    host: ${SSH_HOST}
-    key: ${SSH_KEY}
-    passphrase: ${SSH_PASSPHRASE}
-    port: ${SSH_PORT}
     script:
     - export DOMAIN=$${DOMAIN}
     - export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
@@ -99,7 +136,6 @@ steps:
     - sh .drone/login.sh
     - sh .drone/pull.sh
     - sh .drone/deploy.sh
-    username: ${SSH_USER}
 
 services:
 - name: docker
@@ -110,6 +146,8 @@ services:
     path: /var/run
   - name: ca
     path: /etc/docker/certs.d
+  - name: daemonjson
+    path: /etc/docker/daemon.json
 
 volumes:
 - name: dockersock
@@ -117,6 +155,9 @@ volumes:
 - name: ca
   host:
     path: /etc/docker/certs.d
+- name: daemonjson
+  host:
+    path: /etc/docker/daemon.json
 
 trigger:
   event:
diff --git a/.drone/package.json b/.drone/package.json
index 8501e0b..650ebc0 100644
--- a/.drone/package.json
+++ b/.drone/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
   "dependencies": {
-    "@sigyl/jsonnet-drone": "^0.4.0"
+    "@sigyl/jsonnet-drone": "^0.4.1"
   }
 }
diff --git a/.drone/yarn.lock b/.drone/yarn.lock
index 44ab354..415f02c 100644
--- a/.drone/yarn.lock
+++ b/.drone/yarn.lock
@@ -12,10 +12,10 @@
   resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone-environment/-/jsonnet-drone-environment-0.0.5.tgz#9ea85e08904777bd21a3e4b30b0b91461d0285ff"
   integrity sha512-xVGmdMO1pOyozAWUbJm6mzKBgsLPJ+1hWnGCK3AxPkr7kkDh18hu30+TLzlcQtqq76s5jUfvJUztezsGj/mIcw==
 
-"@sigyl/jsonnet-drone@^0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.1.0.tgz#feda1797e8e9ef799cad72e65f7163ca26a9e3a5"
-  integrity sha512-QY/ngucxFOtLfL8Mt0f2bxN4fQDUOGOFtaRpSH2cNyg84xADkzehT0ORZtbLitr+AwhyF5KN/zAGvzkyNAoqPw==
+"@sigyl/jsonnet-drone@^0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.4.1.tgz#3527edb00f8bb860de1658f4c9fa6f81f932d3b7"
+  integrity sha512-+TOx51KJG1RxrPRZ2lPpia7a6Ms5UvkyLIuXuumPtenyxJ/pivY1TdcLvSAvFgVZHMjh9CxBCuOu8vNT1fPy2A==
   dependencies:
     "@sigyl/jsonnet-compose" "^0.0.2"
     "@sigyl/jsonnet-drone-environment" "0.0.5"