From a2b018a188c5fe5cd91785eae35b269c3b9bad40 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sun, 24 Mar 2024 11:07:07 +0000
Subject: [PATCH] ci: try to fix broken docker test

Upgrade to 22.04 base image and use the existing version of docker.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/docker-test.yml |  2 +-
 scripts/ci/docker-test.sh         | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
index fabf399fd..11d67432b 100644
--- a/.github/workflows/docker-test.yml
+++ b/.github/workflows/docker-test.yml
@@ -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 }})
diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index 7e7ef7197..aaf443afd 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -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