Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use lower fd, remove arm32 checks #994

Merged
merged 2 commits into from
Dec 25, 2024
+2 −18
Merged

use lower fd, remove arm32 checks #994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
617fbba
use lower fd
aptalca Dec 23, 2024
85cda22
remove arm32 check
aptalca Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1

## Buildstage ##
FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage
FROM ghcr.io/linuxserver/baseimage-alpine:3.21 as buildstage

ARG MOD_VERSION

Expand Down
6 changes: 0 additions & 6 deletions root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
#!/usr/bin/with-contenv bash

ARCH=$(uname -m)
if [[ "${ARCH}" = "armv7l" ]]; then
echo "**** The universal docker mod no longer supports arm32v7/armhf per https://info.linuxserver.io/issues/2023-07-01-armhf/ ****"
exit 0
fi

ABC_USER=$(id -nu ${PUID:-911})
mkdir -p /config/{logs/dockerd,var/lib/docker}
lsiown -R ${ABC_USER}:${ABC_USER} /config/logs
Expand Down
5 changes: 0 additions & 5 deletions root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-qemu/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
#!/usr/bin/with-contenv bash

if [[ $(uname -m) = "armv7l" ]]; then
echo "**** The universal docker mod no longer supports arm32v7/armhf per https://info.linuxserver.io/issues/2023-07-01-armhf/ ****"
exit 0
fi

echo "**** Enabling QEMU ****"
docker pull lscr.io/linuxserver/qemu-static
exec docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset -p yes
2 changes: 1 addition & 1 deletion root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/notification-fd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10736
736
5 changes: 0 additions & 5 deletions root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
#!/usr/bin/with-contenv bash

if [[ $(uname -m) = "armv7l" ]]; then
echo "**** The universal docker mod no longer supports arm32v7/armhf per https://info.linuxserver.io/issues/2023-07-01-armhf/ ****"
sleep infinity
fi

## dind hack from https://github.com/moby/moby/blob/master/hack/dind
export container=docker
if [ -d /sys/kernel/security ] && ! mountpoint -q /sys/kernel/security; then
Expand Down
Loading