From efde562a46f059db8fb8f996be55a3a3a8c5d8f5 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Sat, 28 Nov 2020 14:11:46 +0100
Subject: [PATCH] add dockerhub auth for ci

---
 .drone.jsonnet | 12 +++++++++---
 .drone.yml     | 53 ++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index aab1228..026f162 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -1,5 +1,6 @@
 local PipelineTest = {
   kind: 'pipeline',
+  image_pull_secrets: ['docker_config'],
   name: 'test',
   platform: {
     os: 'linux',
@@ -28,6 +29,7 @@ local PipelineTest = {
 
 local PipelineBuildContainer(arch='amd64') = {
   kind: 'pipeline',
+  image_pull_secrets: ['docker_config'],
   name: 'build-container-' + arch,
   platform: {
     os: 'linux',
@@ -36,8 +38,9 @@ local PipelineBuildContainer(arch='amd64') = {
   steps: [
     {
       name: 'dryrun',
-      image: 'plugins/docker:18-linux-' + arch,
+      image: 'plugins/docker:19',
       settings: {
+        config: { from_secret: 'docker_config' },
         dry_run: true,
         dockerfile: 'docker/Dockerfile',
         repo: 'thegeeklab/${DRONE_REPO_NAME}',
@@ -50,8 +53,9 @@ local PipelineBuildContainer(arch='amd64') = {
     },
     {
       name: 'publish-dockerhub',
-      image: 'plugins/docker:18-linux-' + arch,
+      image: 'plugins/docker:19',
       settings: {
+        config: { from_secret: 'docker_config' },
         auto_tag: true,
         auto_tag_suffix: arch,
         dockerfile: 'docker/Dockerfile',
@@ -65,8 +69,9 @@ local PipelineBuildContainer(arch='amd64') = {
     },
     {
       name: 'publish-quay',
-      image: 'plugins/docker:18-linux-' + arch,
+      image: 'plugins/docker:19',
       settings: {
+        config: { from_secret: 'docker_config' },
         auto_tag: true,
         auto_tag_suffix: arch,
         dockerfile: 'docker/Dockerfile',
@@ -90,6 +95,7 @@ local PipelineBuildContainer(arch='amd64') = {
 
 local PipelineNotifications = {
   kind: 'pipeline',
+  image_pull_secrets: ['docker_config'],
   name: 'notifications',
   platform: {
     os: 'linux',
diff --git a/.drone.yml b/.drone.yml
index c8cc096..a9f6b89 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -17,6 +17,9 @@ steps:
   commands:
   - bats ./wait-for.bats
 
+image_pull_secrets:
+- docker_config
+
 trigger:
   ref:
   - refs/heads/master
@@ -33,8 +36,10 @@ platform:
 
 steps:
 - name: dryrun
-  image: plugins/docker:18-linux-amd64
+  image: plugins/docker:19
   settings:
+    config:
+      from_secret: docker_config
     dockerfile: docker/Dockerfile
     dry_run: true
     password:
@@ -47,10 +52,12 @@ steps:
     - refs/pull/**
 
 - name: publish-dockerhub
-  image: plugins/docker:18-linux-amd64
+  image: plugins/docker:19
   settings:
     auto_tag: true
     auto_tag_suffix: amd64
+    config:
+      from_secret: docker_config
     dockerfile: docker/Dockerfile
     password:
       from_secret: docker_password
@@ -63,10 +70,12 @@ steps:
     - refs/tags/**
 
 - name: publish-quay
-  image: plugins/docker:18-linux-amd64
+  image: plugins/docker:19
   settings:
     auto_tag: true
     auto_tag_suffix: amd64
+    config:
+      from_secret: docker_config
     dockerfile: docker/Dockerfile
     password:
       from_secret: quay_password
@@ -79,6 +88,9 @@ steps:
     - refs/heads/master
     - refs/tags/**
 
+image_pull_secrets:
+- docker_config
+
 trigger:
   ref:
   - refs/heads/master
@@ -98,8 +110,10 @@ platform:
 
 steps:
 - name: dryrun
-  image: plugins/docker:18-linux-arm64
+  image: plugins/docker:19
   settings:
+    config:
+      from_secret: docker_config
     dockerfile: docker/Dockerfile
     dry_run: true
     password:
@@ -112,10 +126,12 @@ steps:
     - refs/pull/**
 
 - name: publish-dockerhub
-  image: plugins/docker:18-linux-arm64
+  image: plugins/docker:19
   settings:
     auto_tag: true
     auto_tag_suffix: arm64
+    config:
+      from_secret: docker_config
     dockerfile: docker/Dockerfile
     password:
       from_secret: docker_password
@@ -128,10 +144,12 @@ steps:
     - refs/tags/**
 
 - name: publish-quay
-  image: plugins/docker:18-linux-arm64
+  image: plugins/docker:19
   settings:
     auto_tag: true
     auto_tag_suffix: arm64
+    config:
+      from_secret: docker_config
     dockerfile: docker/Dockerfile
     password:
       from_secret: quay_password
@@ -144,6 +162,9 @@ steps:
     - refs/heads/master
     - refs/tags/**
 
+image_pull_secrets:
+- docker_config
+
 trigger:
   ref:
   - refs/heads/master
@@ -163,8 +184,10 @@ platform:
 
 steps:
 - name: dryrun
-  image: plugins/docker:18-linux-arm
+  image: plugins/docker:19
   settings:
+    config:
+      from_secret: docker_config
     dockerfile: docker/Dockerfile
     dry_run: true
     password:
@@ -177,10 +200,12 @@ steps:
     - refs/pull/**
 
 - name: publish-dockerhub
-  image: plugins/docker:18-linux-arm
+  image: plugins/docker:19
   settings:
     auto_tag: true
     auto_tag_suffix: arm
+    config:
+      from_secret: docker_config
     dockerfile: docker/Dockerfile
     password:
       from_secret: docker_password
@@ -193,10 +218,12 @@ steps:
     - refs/tags/**
 
 - name: publish-quay
-  image: plugins/docker:18-linux-arm
+  image: plugins/docker:19
   settings:
     auto_tag: true
     auto_tag_suffix: arm
+    config:
+      from_secret: docker_config
     dockerfile: docker/Dockerfile
     password:
       from_secret: quay_password
@@ -209,6 +236,9 @@ steps:
     - refs/heads/master
     - refs/tags/**
 
+image_pull_secrets:
+- docker_config
+
 trigger:
   ref:
   - refs/heads/master
@@ -299,6 +329,9 @@ steps:
     - success
     - failure
 
+image_pull_secrets:
+- docker_config
+
 trigger:
   ref:
   - refs/heads/master
@@ -314,6 +347,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: ed7dce0d14be5798a9e179b1561bda835b2ef28ef73dd537213c289fbd356800
+hmac: 22c03cba1bdc4e88f031f2f0cc8b6bcc6c366a03c855318299a6c18805260d2e
 
 ...