From 6bfc133d6ca12c8259ea40fd0c36dc15318ae9f0 Mon Sep 17 00:00:00 2001
From: Maxime Guyot <Miouge1@users.noreply.github.com>
Date: Mon, 22 Jun 2020 13:32:39 +0200
Subject: [PATCH] =?UTF-8?q?[2.13]=C2=A0Update=20base=20image=20to=20v2.12.?=
 =?UTF-8?q?7=20(#6295)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Use v2.12.7 base image for CI

* Use 19.03.9 in localhost CI (#6201)
---
 .gitlab-ci.yml        | 2 +-
 .gitlab-ci/packet.yml | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a14f43a5c..76f049b93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ stages:
   - deploy-special
 
 variables:
-  KUBESPRAY_VERSION: v2.12.6
+  KUBESPRAY_VERSION: v2.12.7
   FAILFASTCI_NAMESPACE: 'kargo-ci'
   GITLAB_REPOSITORY: 'kargo-ci/kubernetes-sigs-kubespray'
   ANSIBLE_FORCE_COLOR: "true"
diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index bad4a21ca..01286d17c 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -74,8 +74,11 @@ packet_centos7-calico-ha-once-localhost:
   stage: deploy-part2
   extends: .packet
   when: on_success
+  variables:
+    # This will instruct Docker not to start over TLS.
+    DOCKER_TLS_CERTDIR: ""
   services:
-    - docker:18.09.9-dind
+    - docker:19.03.9-dind
 
 packet_centos8-kube-ovn:
   stage: deploy-part2