From 1bb8c1102ea7e413f1517dc83268815ba34135d7 Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <v-mitim@microsoft.com>
Date: Mon, 6 Jul 2020 10:53:26 +0300
Subject: [PATCH] Move containers installation file

---
 .../scripts/installers/2004/containers.sh     | 24 -------------------
 .../installers/{1804 => }/containers.sh       |  0
 images/linux/ubuntu1804.json                  |  2 +-
 images/linux/ubuntu2004.json                  |  2 +-
 4 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 images/linux/scripts/installers/2004/containers.sh
 rename images/linux/scripts/installers/{1804 => }/containers.sh (100%)

diff --git a/images/linux/scripts/installers/2004/containers.sh b/images/linux/scripts/installers/2004/containers.sh
deleted file mode 100644
index 0ccf746abbd3..000000000000
--- a/images/linux/scripts/installers/2004/containers.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-################################################################################
-##  File:  containers.sh
-##  Desc:  Installs container tools: podman, buildah and skopeo onto the image
-################################################################################
-
-source $HELPER_SCRIPTS/apt.sh
-source $HELPER_SCRIPTS/document.sh
-
-source /etc/os-release
-sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list"
-wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/x${NAME}_${VERSION_ID}/Release.key -O Release.key
-apt-key add - < Release.key
-apt-get update -qq
-apt-get -qq -y install podman buildah skopeo
-mkdir -p /etc/containers
-echo -e "[registries.search]\nregistries = ['docker.io', 'quay.io']" | tee /etc/containers/registries.conf
-
-## Add version information to the metadata file
-echo "Documenting container tools version"
-PODMAN_VERSION='podman --version'
-BUILDAH_VERSION='buildah --version'
-SKOPEO_VERSION='skopeo --version'
-DocumentInstalledItem "Podman ($PODMAN_VERSION)\nBuildah ($BUILDAH_VERSION)\nSkopeo ($SKOPEO_VERSION)"
diff --git a/images/linux/scripts/installers/1804/containers.sh b/images/linux/scripts/installers/containers.sh
similarity index 100%
rename from images/linux/scripts/installers/1804/containers.sh
rename to images/linux/scripts/installers/containers.sh
diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json
index 8a2a12574454..f40fe02c0e4a 100644
--- a/images/linux/ubuntu1804.json
+++ b/images/linux/ubuntu1804.json
@@ -183,7 +183,7 @@
                 "{{template_dir}}/scripts/installers/clang.sh",
                 "{{template_dir}}/scripts/installers/swift.sh",
                 "{{template_dir}}/scripts/installers/cmake.sh",
-                "{{template_dir}}/scripts/installers/1804/containers.sh",
+                "{{template_dir}}/scripts/installers/containers.sh",
                 "{{template_dir}}/scripts/installers/docker-compose.sh",
                 "{{template_dir}}/scripts/installers/docker-moby.sh",
                 "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh",
diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json
index eb9583272772..64fcd69ce494 100644
--- a/images/linux/ubuntu2004.json
+++ b/images/linux/ubuntu2004.json
@@ -185,7 +185,7 @@
                 "{{template_dir}}/scripts/installers/clang.sh",
                 "{{template_dir}}/scripts/installers/swift.sh",
                 "{{template_dir}}/scripts/installers/cmake.sh",
-                "{{template_dir}}/scripts/installers/2004/containers.sh",
+                "{{template_dir}}/scripts/installers/containers.sh",
                 "{{template_dir}}/scripts/installers/docker-compose.sh",
                 "{{template_dir}}/scripts/installers/docker-moby.sh",
                 "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh",