From 7b20c5670b308e361e09933158e0e3c589e35349 Mon Sep 17 00:00:00 2001
From: Henrik Triem <henrik.triem@icinga.com>
Date: Thu, 28 Jul 2022 15:15:58 +0000
Subject: [PATCH] Use different docker & qemu in install-docker-rpm.sh
---
install-docker-rpm.sh | 28 +++++++++++-----------------
1 file changed, 11 insertions(+), 17 deletions(-)
diff --git a/install-docker-rpm.sh b/install-docker-rpm.sh
index 0a76c17..5203896 100644
--- a/install-docker-rpm.sh
+++ b/install-docker-rpm.sh
@@ -12,24 +12,18 @@ run() {
(set -x; "$@")
}
-sudo mkdir -p /etc/docker
-
-cat <<EOF |sudo tee /etc/docker/daemon.json >/dev/null
-{
- "registry-mirrors": ["https://mirror.gcr.io"]
-}
-EOF
+echo "Activating RHEL 9 subscription"
+sudo subscription-manager register --name=icinga-gitlab-runner-el9 --org=7980812 --activationkey=GitLab_Chahng0wah
+sudo dnf clean all
+sudo subscription-manager repos --enable "codeready-builder-for-rhel-9-x86_64-rpms"
+sudo dnf clean all
-echo "Installing Docker via get.docker.com"
-run curl -LsS https://get.docker.com -o /tmp/get-docker.sh
-run sh /tmp/get-docker.sh
+echo "Installing Docker from CentOS"
+sudo mkdir -p /etc/docker
+sudo dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
+sudo dnf install docker-ce docker-ce-cli containerd.io docker-compose-plugin
echo "Installing QEMU and helpers"
-run sudo dnf update
-run sudo dnf install -y qemu-user-static binfmt-support
-
-echo "Activating RHEL 9 subscription"
-run sudo subscription-manager register --name=icinga-gitlab-runner-el9 --org=7980812 --activationkey=GitLab_Chahng0wah
-run sudo dnf clean all
-run sudo subscription-manager repos --enable "codeready-builder-for-rhel-9-x86_64-rpms"
+sudo dnf update
+sudo dnf install -y qemu-kvm
--
GitLab