From f22f787c3a30ee52fb5aae8dd3b07ad76023ccaf Mon Sep 17 00:00:00 2001 From: Silvija Tovernic Date: Sat, 21 Sep 2024 16:30:18 +0200 Subject: [PATCH] Revert "Revert "remove qemu from dockerfile completely"" This reverts commit 7c68c76523375ccf256b1aec4674115f5b62d2ba. --- images/docker/image-factory-runner/Dockerfile | 2 -- images/docker/image-factory-runner/files/gha | 2 -- .../image-factory-runner/scripts/start-github-runner.sh | 4 ---- 3 files changed, 8 deletions(-) diff --git a/images/docker/image-factory-runner/Dockerfile b/images/docker/image-factory-runner/Dockerfile index 3010a2ea..4fde4e68 100644 --- a/images/docker/image-factory-runner/Dockerfile +++ b/images/docker/image-factory-runner/Dockerfile @@ -23,8 +23,6 @@ RUN apt-get update -y && \ libcap2-bin \ lsb-release \ podman \ - qemu \ - qemu-user-static \ slirp4netns \ software-properties-common \ sudo \ diff --git a/images/docker/image-factory-runner/files/gha b/images/docker/image-factory-runner/files/gha index a0fe1b33..5fc71e03 100644 --- a/images/docker/image-factory-runner/files/gha +++ b/images/docker/image-factory-runner/files/gha @@ -1,5 +1,3 @@ gha ALL=(ALL) NOPASSWD: /bin/umount /.pat gha ALL=(ALL) NOPASSWD: /bin/rmdir /.pat -gha ALL=(ALL) NOPASSWD: /usr/sbin/update-binfmts --enable qemu-aarch64 -gha ALL=(ALL) NOPASSWD: /usr/sbin/update-binfmts --enable qemu-arm gha ALL=(ALL) NOPASSWD:ALL # TODO: remove this line once development is done diff --git a/images/docker/image-factory-runner/scripts/start-github-runner.sh b/images/docker/image-factory-runner/scripts/start-github-runner.sh index 8c1fd74f..84a9bfb3 100644 --- a/images/docker/image-factory-runner/scripts/start-github-runner.sh +++ b/images/docker/image-factory-runner/scripts/start-github-runner.sh @@ -28,10 +28,6 @@ echo "Deleting PAT token from runner filesystem..." sudo umount /.pat sudo rmdir /.pat -# # QEMU setup -# sudo update-binfmts --enable qemu-aarch64 -# sudo update-binfmts --enable qemu-arm - echo "Connect runner to GitHub:" cd actions-runner ./config.sh \