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

[Ubuntu] Revert previously removed Docker tests (#9824)

Browse Source
This commit is contained in:
Erik Bershel
2024-05-25 15:14:03 +02:00
committed by GitHub
parent 36549632ce
commit ed92ac6e3f
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
images/ubuntu/scripts/build/install-docker.sh
View File

@@ -47,8 +47,14 @@ done
# docker from official repo introduced different GID generation: https://github.com/actions/runner-images/issues/8157 # docker from official repo introduced different GID generation: https://github.com/actions/runner-images/issues/8157
gid=$(cut -d ":" -f 3 /etc/group | grep "^1..$" | sort -n | tail -n 1 | awk '{ print $1+1 }') gid=$(cut -d ":" -f 3 /etc/group | grep "^1..$" | sort -n | tail -n 1 | awk '{ print $1+1 }')
groupmod -g "$gid" docker groupmod -g "$gid" docker
chgrp -hR docker /run/docker.sock
chgrp -hR docker /var/run/docker.sock # Create systemd-tmpfiles configuration for Docker
cat <<EOF | sudo tee /etc/tmpfiles.d/docker.conf
L /run/docker.sock - - - - root docker 0770
EOF
# Reload systemd-tmpfiles to apply the new configuration
systemd-tmpfiles --create /etc/tmpfiles.d/docker.conf
# Enable docker.service # Enable docker.service
systemctl is-active --quiet docker.service || systemctl start docker.service systemctl is-active --quiet docker.service || systemctl start docker.service

19
images/ubuntu/scripts/tests/Tools.Tests.ps1
View File

@@ -69,12 +69,27 @@ Describe "Docker" {
It "docker client" { It "docker client" {
$version=(Get-ToolsetContent).docker.components | Where-Object { $_.package -eq 'docker-ce-cli' } | Select-Object -ExpandProperty version $version=(Get-ToolsetContent).docker.components | Where-Object { $_.package -eq 'docker-ce-cli' } | Select-Object -ExpandProperty version
If ($version -ne "latest") { If ($version -ne "latest") {
$(docker version --format '{{.Client.Version}}') | Should -BeLike "*$version*" $(sudo docker version --format '{{.Client.Version}}') | Should -BeLike "*$version*"
}else{ }else{
"docker version --format '{{.Client.Version}}'" | Should -ReturnZeroExitCode "sudo docker version --format '{{.Client.Version}}'" | Should -ReturnZeroExitCode
} }
} }
It "docker server" {
$version=(Get-ToolsetContent).docker.components | Where-Object { $_.package -eq 'docker-ce' } | Select-Object -ExpandProperty version
If ($version -ne "latest") {
$(sudo docker version --format '{{.Server.Version}}') | Should -BeLike "*$version*"
}else{
"sudo docker version --format '{{.Server.Version}}'" | Should -ReturnZeroExitCode
}
}
It "docker client/server versions match" {
$clientVersion = $(sudo docker version --format '{{.Client.Version}}')
$serverVersion = $(sudo docker version --format '{{.Server.Version}}')
$clientVersion | Should -Be $serverVersion
}
It "docker buildx" { It "docker buildx" {
$version=(Get-ToolsetContent).docker.plugins | Where-Object { $_.plugin -eq 'buildx' } | Select-Object -ExpandProperty version $version=(Get-ToolsetContent).docker.plugins | Where-Object { $_.plugin -eq 'buildx' } | Select-Object -ExpandProperty version
If ($version -ne "latest") { If ($version -ne "latest") {