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

[Ubuntu] Rework podman and tools installation (#5580)

Browse Source
This commit is contained in:
Mikhail Koliada
2022-05-20 15:40:31 +02:00
committed by GitHub
parent 984b0a83de
commit e4d58452f4
7 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View File

@@ -149,10 +149,14 @@ $toolsList = @(
if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) {
$toolsList += @(
(Get-BuildahVersion),
(Get-PhantomJSVersion),
(Get-LeiningenVersion),
(Get-HHVMVersion),
(Get-HHVMVersion)
)
}
if (Test-IsUbuntu22) {
$toolsList += @(
(Get-BuildahVersion),
(Get-PodManVersion),
(Get-SkopeoVersion)
)

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

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

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

@@ -4,25 +4,11 @@
## Desc: Installs container tools: podman, buildah and skopeo onto the image
################################################################################
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 ${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
# Install podman, buildah, scopeo container's tools
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"

3
images/linux/scripts/tests/Tools.Tests.ps1
View File

@@ -21,7 +21,6 @@ Describe "Rust" {
$env:CARGO_HOME = "/etc/skel/.cargo"
}
It "Rustup is installed" {
"rustup --version" | Should -ReturnZeroExitCode
}
@@ -336,7 +335,7 @@ Describe "GraalVM" -Skip:(Test-IsUbuntu18) {
}
}
Describe "Containers" -Skip:(Test-IsUbuntu22) {
Describe "Containers" -Skip:(-not (Test-IsUbuntu22)) {
$testCases = @("podman", "buildah", "skopeo") | ForEach-Object { @{ContainerCommand = $_} }
It "<ContainerCommand>" -TestCases $testCases {

1
images/linux/ubuntu1804.json
View File

@@ -199,7 +199,6 @@
"{{template_dir}}/scripts/installers/swift.sh",
"{{template_dir}}/scripts/installers/cmake.sh",
"{{template_dir}}/scripts/installers/codeql-bundle.sh",
"{{template_dir}}/scripts/installers/containers.sh",
"{{template_dir}}/scripts/installers/dotnetcore-sdk.sh",
"{{template_dir}}/scripts/installers/erlang.sh",
"{{template_dir}}/scripts/installers/firefox.sh",

1
images/linux/ubuntu2004.json
View File

@@ -200,7 +200,6 @@
"{{template_dir}}/scripts/installers/swift.sh",
"{{template_dir}}/scripts/installers/cmake.sh",
"{{template_dir}}/scripts/installers/codeql-bundle.sh",
"{{template_dir}}/scripts/installers/containers.sh",
"{{template_dir}}/scripts/installers/dotnetcore-sdk.sh",
"{{template_dir}}/scripts/installers/erlang.sh",
"{{template_dir}}/scripts/installers/firefox.sh",

1
images/linux/ubuntu2204.pkr.hcl
View File

@@ -276,6 +276,7 @@ build {
"${path.root}/scripts/installers/clang.sh",
"${path.root}/scripts/installers/cmake.sh",
"${path.root}/scripts/installers/codeql-bundle.sh",
"${path.root}/scripts/installers/containers.sh",
"${path.root}/scripts/installers/dotnetcore-sdk.sh",
"${path.root}/scripts/installers/gcc.sh",
"${path.root}/scripts/installers/gfortran.sh",