Skip to content

Commit 69529ee

Browse files
committed
Update docker-sbuild to Trixie
1 parent c593c3e commit 69529ee

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

docker-sbuild/docker-sbuild

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ fi
5555
uid="$(id -u)"
5656
gid="$(id -g)"
5757
cat > "$workdir/Dockerfile" <<-EODF
58-
FROM debian:bookworm-slim
58+
FROM debian:trixie-slim
5959
RUN set -ex; \
6060
apt-get update; \
6161
apt-get install -y --no-install-recommends \
@@ -67,7 +67,7 @@ cat > "$workdir/Dockerfile" <<-EODF
6767
rm -rf /var/lib/apt/lists/*
6868
RUN set -eux; \
6969
groupadd --gid '$gid' user; \
70-
useradd --gid '$gid' --uid '$uid' --groups sbuild user
70+
useradd --gid '$gid' --uid '$uid' --groups sbuild --create-home user
7171
# schroot is picky about tarball ownership
7272
COPY --chown=root:root $tarBase /schroot/
7373
COPY schroot.conf /etc/schroot/chroot.d/tar
@@ -113,7 +113,7 @@ args+=(
113113
' --
114114

115115
# set a few defaults (TODO set these differently so we can override them easier)
116-
--chroot-mode schroot --chroot tar
116+
--chroot-mode schroot --chroot tar # TODO switch to "unshare mode" ? (it uses unprivileged user namespaces, so might actually be *more* annoying than schroot, on the whole)
117117
--no-run-lintian
118118
--build-dir /target
119119

0 commit comments

Comments
 (0)