actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-14 05:07:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* remove apt source list

* debug

* document source repo and fix installation

* small fix
This commit is contained in:
Dibir Magomedsaygitov
2021-04-08 14:13:21 +03:00
committed by GitHub
parent 6858b9232d
commit 21b8cadc2c
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
View File

@@ -34,17 +34,20 @@ function Get-CodeQLBundleVersion {
function Get-PodManVersion { function Get-PodManVersion {
$podmanVersion = podman --version | Take-OutputPart -Part 2 $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 { function Get-BuildahVersion {
$buildahVersion = buildah --version | Take-OutputPart -Part 2 $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 { function Get-SkopeoVersion {
$skopeoVersion = skopeo --version | Take-OutputPart -Part 2 $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 { function Get-CMakeVersion {

14
images/linux/scripts/installers/containers.sh
View File

@@ -4,10 +4,14 @@
## Desc: Installs container tools: podman, buildah and skopeo onto the image ## 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) 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 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 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-key add Release.key
apt-get update -qq apt-get update -qq
@@ -15,4 +19,10 @@ apt-get -qq -y install ${install_packages[@]}
mkdir -p /etc/containers mkdir -p /etc/containers
echo -e "[registries.search]\nregistries = ['docker.io', 'quay.io']" | tee /etc/containers/registries.conf 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" invoke_tests "Tools" "Containers"