Skip to content

Docker: update to Debian Trixie and add shfmt #80

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

Open
BKPepe wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Docker: update to Debian Trixie and add shfmt #80

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
7e9dfde
docker: upgrade base images to debian:13
BKPepe Jun 24, 2026
44286e0
docker: buildworker: install shfmt
BKPepe Jun 24, 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
8 changes: 5 additions & 3 deletions docker/buildmaster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN git checkout $APK_TOOLS_COMMIT
RUN make -j$(nproc) static


FROM debian:11
FROM debian:13
LABEL maintainer="OpenWrt Maintainers"

ARG DEBIAN_FRONTEND=noninteractive
Expand All @@ -41,8 +41,9 @@ RUN \
build-essential \
gawk \
git-core \
gnupg \
gosu \
libncurses5-dev \
libncurses-dev \
locales \
pv \
pwgen \
Expand All @@ -65,7 +66,8 @@ RUN \
"buildbot-grid-view==$BUILDBOT_VERSION" \
"buildbot-worker==$BUILDBOT_VERSION" \
pyOpenSSL \
service_identity
service_identity \
legacy-cgi

RUN \
sed -i \
Expand Down
10 changes: 7 additions & 3 deletions docker/buildworker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:11
FROM debian:13
LABEL maintainer="OpenWrt Maintainers"

ARG DEBIAN_FRONTEND=noninteractive
Expand All @@ -24,10 +24,11 @@ RUN \
gcc-multilib \
genisoimage \
git-core \
gnupg \
gosu \
libdw-dev \
libelf-dev \
libncurses5-dev \
libncurses-dev \
locales \
pv \
pwgen \
Expand All @@ -39,6 +40,7 @@ RUN \
qemu-utils \
rsync \
signify-openbsd \
shfmt \
subversion \
swig \
unzip \
Expand All @@ -54,7 +56,9 @@ RUN pip3 install \
"buildbot-worker==$BUILDBOT_VERSION" \
pyelftools \
pyOpenSSL \
service_identity
service_identity \
legacy-cgi


ENV LANG=en_US.utf8

Expand Down
Loading