From d86ec580adef97e5cf0218fc5c739674ae34c2c7 Mon Sep 17 00:00:00 2001
From: Devan Carpenter <dvn@pep-project.org>
Date: Tue, 23 Feb 2021 10:16:04 +0100
Subject: [PATCH] CID: don't use insecure docker registries anymore

We now have a public registry, so we don't use registries on the LAN
with only HTTP anymore. Let's remove the possiblity to use plain
HTTP.
---
 .gitlab-ci-files/common-prepare.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.gitlab-ci-files/common-prepare.yml b/.gitlab-ci-files/common-prepare.yml
index 14567f1..8053794 100644
--- a/.gitlab-ci-files/common-prepare.yml
+++ b/.gitlab-ci-files/common-prepare.yml
@@ -8,23 +8,11 @@
   - 'which rsync || ( sudo apt-get update -y && sudo apt-get install rsync -y )'
   - 'which make || ( sudo apt-get update -y && sudo apt-get install make -y )'
 
-.enable_insecure_docker_registries: &enable_insecure_docker_registries
-  # Enable "insecure" docker registries
-  - |
-      cat <<EOD > /tmp/docker-daemon.json
-      {
-                "insecure-registries" : ["${DOCKER_REGISTRY_HOST}"]
-      }
-      EOD
-  - sudo cp /tmp/docker-daemon.json /etc/docker/daemon.json
-  - sudo systemctl restart docker.service
-
 .standard_job:
   tags: [kvm]
   before_script:
     - *ensure_docker
     - *ensure_rsync
-    - *enable_insecure_docker_registries
 
 .make_in_docker:
   extends: .standard_job