[Ubuntu] Remove apt source for podman, buildah and skopeo (#3077)

* remove apt source list

* debug

* document source repo and fix installation

* small fix

images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1

@@ -34,17 +34,20 @@ function Get-CodeQLBundleVersion {
 
 function Get-PodManVersion {
     $podmanVersion = podman --version | Take-OutputPart -Part 2
-    return "Podman $podmanVersion"
+    $aptSourceRepo = Get-AptSourceRepository -PackageName "containers"
+    return "Podman $podmanVersion (apt source repository: $aptSourceRepo)"
 }
 
 function Get-BuildahVersion {
     $buildahVersion = buildah --version | Take-OutputPart -Part 2
-    return "Buildah $buildahVersion"
+    $aptSourceRepo = Get-AptSourceRepository -PackageName "containers"
+    return "Buildah $buildahVersion (apt source repository: $aptSourceRepo)"
 }
 
 function Get-SkopeoVersion {
     $skopeoVersion = skopeo --version | Take-OutputPart -Part 2
-    return "Skopeo $skopeoVersion"
+    $aptSourceRepo = Get-AptSourceRepository -PackageName "containers"
+    return "Skopeo $skopeoVersion (apt source repository: $aptSourceRepo)"
 }
 
 function Get-CMakeVersion {

images/linux/scripts/installers/containers.sh

@@ -4,15 +4,25 @@
 ##  Desc:  Installs container tools: podman, buildah and skopeo onto the image
 ################################################################################
 
-# Install podman, buildah, scopeo container's tools
+source $HELPER_SCRIPTS/os.sh
+
 install_packages=(podman buildah skopeo)
+REPO_URL="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable"
+
+# Install podman, buildah, scopeo container's tools (on Ubuntu20 these tools can be installed without adding new repository)
 source /etc/os-release
-sh -c "echo 'deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list"
+sh -c "echo 'deb ${REPO_URL}/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list"
 wget -qnv 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 ${install_packages[@]}
 mkdir -p /etc/containers
 echo -e "[registries.search]\nregistries = ['docker.io', 'quay.io']" | tee /etc/containers/registries.conf
 
+# Remove source repo
+rm /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
+
+# Document source repo
+echo "containers $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt
+
 invoke_tests "Tools" "Containers"