Skip to content

Fix build issues with buildx > 0.32.0 #16

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

Merged
thespad merged 4 commits into from
Mar 15, 2026
Merged

Fix build issues with buildx > 0.32.0 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b208b00
Tidy up obsolete settings, fix typo, add extra packages
thespad Mar 15, 2026
9813cb4
Remove experimental arg
thespad Mar 15, 2026
8f67be3
Set home to /config at build time
thespad Mar 15, 2026
47e65ee
Remove HOMEs that aren't required any more
thespad Mar 15, 2026
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
4 changes: 4 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,19 @@ ARG BUILD_AGENT_RELEASE
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="thespad"

ENV HOME=/config

RUN \
echo "**** install runtime packages ****" && \
apk add --no-cache --upgrade \
alpine-release \
btrfs-progs \
docker \
docker-cli-buildx \
docker-cli-compose \
e2fsprogs \
e2fsprogs-extra \
erofs-utils \
git \
ip6tables \
iptables \
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile.aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,19 @@ ARG BUILD_AGENT_RELEASE
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="thespad"

ENV HOME=/config

RUN \
echo "**** install runtime packages ****" && \
apk add --no-cache --upgrade \
alpine-release \
btrfs-progs \
docker \
docker-cli-buildx \
docker-cli-compose \
e2fsprogs \
e2fsprogs-extra \
erofs-utils \
git \
ip6tables \
iptables \
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile.riscv64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,19 @@ ARG BUILD_AGENT_RELEASE
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="thespad"

ENV HOME=/config

RUN \
echo "**** install runtime packages ****" && \
apk add --no-cache --upgrade \
alpine-release \
btrfs-progs \
docker \
docker-cli-buildx \
docker-cli-compose \
e2fsprogs \
e2fsprogs-extra \
erofs-utils \
git \
ip6tables \
iptables \
Expand Down
22 changes: 2 additions & 20 deletions root/etc/s6-overlay/s6-rc.d/init-build-agent-config/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,26 +104,8 @@ if ! id -nG "$(id -nu "${PUID:-911}")" | grep -q "docker"; then
usermod -aG docker "$(id -nu "${PUID:-911}")"
fi

HOME=/config git config --global user.email "ci@linuxserver.io"
HOME=/config git config --global user.name "LinuxServer-CI"

# Remove old Docker image store
if [[ -d "/config/var/lib/docker/overlay2/" ]]; then
rm -rf "/config/var/lib/docker/overlay2/"
fi

if [[ -d "/config/var/lib/docker/image/" ]]; then
rm -rf "/config/var/lib/docker/image/"
fi

# Enable containerd image store
cat <<EOF >/etc/docker/daemon.json
{
"features": {
"containerd-snapshotter": true
}
}
EOF
git config --global user.email "ci@linuxserver.io"
git config --global user.name "LinuxServer-CI"

# permissions
lsiown -R "${USER_NAME}":"${USER_NAME}" \
Expand Down
4 changes: 2 additions & 2 deletions root/etc/s6-overlay/s6-rc.d/init-buildx-config/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# shellcheck shell=bash

docker pull docker.io/moby/buildkit:buildx-stable-1
HOME=/config docker buildx rm container >/dev/null 2>&1
HOME=/config docker buildx create --driver docker-container --name container --bootstrap >/dev/null 2>&1
docker buildx rm container >/dev/null 2>&1
docker buildx create --driver docker-container --name container --bootstrap >/dev/null 2>&1
docker image prune -f >/dev/null 2>&1

USER_NAME=${USER_NAME:-jenkins}
Expand Down
2 changes: 1 addition & 1 deletion root/etc/s6-overlay/s6-rc.d/init-qemu/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/with-contenv bash

echo "┌─────────────────────────────────────────────────────────────────────────────────┐"
echo "│ Make sure you enable you enable QEMU. Run: │"
echo "│ Make sure you enable QEMU. Run: │"
echo "│ │"
echo "│ docker run --rm -it --privileged ghcr.io/linuxserver/qemu-static --reset -p yes │"
echo "│ │"
Expand Down
2 changes: 1 addition & 1 deletion root/etc/s6-overlay/s6-rc.d/svc-docker-in-docker/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ mount --make-rshared /

exec 2>&1 \
s6-notifyoncheck -d -n 300 -w 1000 -c "docker version" \
/usr/bin/dockerd --data-root "/config/var/lib/docker" --experimental
/usr/bin/dockerd --data-root "/config/var/lib/docker"