Merge pull request #10 from linuxserver/setup-buildx-container

linuxserver · Nov 9, 2024 · 70395a1 · 70395a1
2 parents 416f827 + a961e54
commit 70395a1
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git 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-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
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
@@ -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
@@ -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
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-buildx-config/run
diff --git 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 "└─────────────────────────────────────────────────────────────────────────────────┘"
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