From e51a62d0e15e1c3bd05bccb9d0e9d942132549c3 Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 8 Nov 2024 19:31:59 +0000 Subject: [PATCH 1/3] Setup buildx container --- .../init-buildx-config/dependencies.d/svc-docker-in-docker | 0 root/etc/s6-overlay/s6-rc.d/init-buildx-config/run | 4 ++++ root/etc/s6-overlay/s6-rc.d/init-buildx-config/type | 1 + root/etc/s6-overlay/s6-rc.d/init-buildx-config/up | 1 + .../etc/s6-overlay/s6-rc.d/user/contents.d/init-buildx-config | 0 5 files changed, 6 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-buildx-config/dependencies.d/svc-docker-in-docker create mode 100644 root/etc/s6-overlay/s6-rc.d/init-buildx-config/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-buildx-config/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-buildx-config/up create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-buildx-config diff --git a/root/etc/s6-overlay/s6-rc.d/init-buildx-config/dependencies.d/svc-docker-in-docker b/root/etc/s6-overlay/s6-rc.d/init-buildx-config/dependencies.d/svc-docker-in-docker new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-buildx-config/run b/root/etc/s6-overlay/s6-rc.d/init-buildx-config/run new file mode 100644 index 0000000..f78f5fa --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-buildx-config/run @@ -0,0 +1,4 @@ +#!/usr/bin/with-contenv bash +# shellcheck shell=bash + +docker buildx create --driver docker-container --name container >/dev/null 2>&1 diff --git a/root/etc/s6-overlay/s6-rc.d/init-buildx-config/type b/root/etc/s6-overlay/s6-rc.d/init-buildx-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-buildx-config/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-buildx-config/up b/root/etc/s6-overlay/s6-rc.d/init-buildx-config/up new file mode 100644 index 0000000..da44f31 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-buildx-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-buildx-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-buildx-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-buildx-config new file mode 100644 index 0000000..e69de29 From 4cad2dd84b996d735b489809ab58ae31c44146ff Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 8 Nov 2024 19:32:07 +0000 Subject: [PATCH 2/3] Update qemu info --- README.md | 2 +- root/etc/s6-overlay/s6-rc.d/init-qemu/run | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 0541495..b561bc5 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ services: restart: unless-stopped ``` -For x86_64 machines, run `docker run --rm --privileged multiarch/qemu-user-static --reset -p yes` on the host to enable qemu before bringing any build agent containers up. +Run `docker run --rm -it --privileged ghcr.io/linuxserver/qemu-static --reset -p yes` on the host to enable qemu before bringing any build agent containers up. - { date: "01.07.24:", desc: "Update JRE to 17." } - { date: "16.01.24:", desc: "Add yq." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-qemu/run b/root/etc/s6-overlay/s6-rc.d/init-qemu/run index c6652c2..fab3f50 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-qemu/run +++ b/root/etc/s6-overlay/s6-rc.d/init-qemu/run @@ -1,11 +1,9 @@ #!/usr/bin/with-contenv bash -if [[ $(uname -m) = "x86_64" ]]; then - echo "┌───────────────────────────────────────────────────────────────────────────────┐" - echo "│ Make sure you enable you enable QEMU. Run: │" - echo "│ │" - echo "│ docker run --rm --privileged multiarch/qemu-user-static --reset -p yes │" - echo "│ │" - echo "│ on the host │" - echo "└───────────────────────────────────────────────────────────────────────────────┘" -fi +echo "┌─────────────────────────────────────────────────────────────────────────────────┐" +echo "│ Make sure you enable you enable QEMU. Run: │" +echo "│ │" +echo "│ docker run --rm -it --privileged ghcr.io/linuxserver/qemu-static --reset -p yes │" +echo "│ │" +echo "│ on the host │" +echo "└─────────────────────────────────────────────────────────────────────────────────┘" From a961e5423f0a609a40dacf98ad45d806fd6f5d1e Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 8 Nov 2024 21:19:58 +0000 Subject: [PATCH 3/3] Make executable --- root/etc/s6-overlay/s6-rc.d/init-buildx-config/run | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 root/etc/s6-overlay/s6-rc.d/init-buildx-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-buildx-config/run b/root/etc/s6-overlay/s6-rc.d/init-buildx-config/run old mode 100644 new mode 100755