From 84589ee74e9a47f52a2bfec761a1fe1747192e6a Mon Sep 17 00:00:00 2001
From: Lluis Campos <lluis.campos@northern.tech>
Date: Fri, 13 Nov 2020 09:56:58 +0100
Subject: [PATCH] [pipeline] Update images used for DinD

Following recent changes in mender-qa and the GitLab master runner.

Changelog: None

Signed-off-by: Lluis Campos <lluis.campos@northern.tech>
---
 .gitlab-ci.yml | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ad2862..36130c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,15 @@ variables:
 
   DEBIAN_FRONTEND: noninteractive
 
+  # Docker dind configuration.
+  # To use dind, make sure gitlab-runner's configuration
+  # has a common mount for /certs (i.e. runners.docker.volumes) directory
+  # and that the dind service name is always docker (default hostname).
+  DOCKER_HOST: "tcp://docker:2376"
+  DOCKER_CERT_PATH: "/certs/client"
+  DOCKER_TLS_VERIFY: "1"
+  DOCKER_TLS_CERTDIR: "/certs"
+
 include:
   - project: 'Northern.tech/Mender/mendertesting'
     file: '.gitlab-ci-check-commits.yml'
@@ -47,16 +56,16 @@ build:
   needs:
     - job: build
       artifacts: true
-  image: teracy/ubuntu:18.04-dind-18.09.9
+  image: ubuntu:18.04
   services:
-    - docker:18-dind
+    - docker:19.03-dind
   tags:
     - mender-qa-slave
   before_script:
     - export AWS_ACCESS_KEY_ID=$TMP_STORAGE_AWS_ACCESS_KEY_ID
     - export AWS_SECRET_ACCESS_KEY=$TMP_STORAGE_AWS_SECRET_ACCESS_KEY
 
-    - apt update && apt install -yy bash wget unzip awscli
+    - apt update && apt install -yy bash wget unzip awscli docker.io
 
     - export IMAGE_NAME=$DOCKER_REPOSITORY:pr
     - docker load -i image.tar
@@ -92,9 +101,9 @@ convert_raspbian_raspberrypi4:
   needs:
     - job: build
       artifacts: true
-  image: teracy/ubuntu:18.04-dind-18.09.9
+  image: ubuntu:18.04
   services:
-    - docker:18-dind
+    - docker:19.03-dind
   tags:
     - mender-qa-slave
   timeout: 2h
@@ -105,7 +114,7 @@ convert_raspbian_raspberrypi4:
     - apt update
     - apt install -qyy bash wget git util-linux mtools python3 python3-pip
       gcc python3-dev libffi-dev liblzo2-dev libc-dev libssl-dev make sudo
-      awscli unzip qemu-system-x86 ovmf
+      awscli unzip qemu-system-x86 ovmf curl docker.io
     # Python3 dependencies
     - pip3 install -r https://raw.githubusercontent.com/mendersoftware/meta-mender/master/tests/acceptance/requirements_py3.txt
     # Load image under test