Skip to content

Commit

Permalink
ci: try to fix broken docker test
Browse files Browse the repository at this point in the history
Upgrade to 22.04 base image and use the existing version of docker.

Signed-off-by: Adrian Reber <areber@redhat.com>
  • Loading branch information
adrianreber authored and avagin committed Mar 25, 2024
1 parent cb39c62 commit f7b2e63
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04]
os: [ubuntu-22.04]
steps:
- uses: actions/checkout@v2
- name: Run Docker Test (${{ matrix.os }})
Expand Down
19 changes: 0 additions & 19 deletions scripts/ci/docker-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,6 @@

set -x -e -o pipefail

./apt-install \
apt-transport-https \
ca-certificates \
curl \
software-properties-common

curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -

add-apt-repository \
"deb [arch=amd64] https://download.docker.com/linux/ubuntu \
$(lsb_release -cs) \
stable test"

# checkpoint/restore is broken in Docker Engine (Community) version 25.0.0-beta.1
# https://github.com/moby/moby/discussions/46816
# Downgrade to the latest stable version.
VERSION_STRING=5:24.0.7-1~ubuntu.20.04~focal
./apt-install docker-ce=$VERSION_STRING docker-ce-cli=$VERSION_STRING containerd.io docker-buildx-plugin docker-compose-plugin

# docker checkpoint and restore is an experimental feature
echo '{ "experimental": true }' > /etc/docker/daemon.json
service docker restart
Expand Down

0 comments on commit f7b2e63

Please sign in to comment.