Skip to content

Commit a9f4f0d

Browse files
authored
Merge pull request #199 from infosiftr/remove-cbq
Apply patch to remove CBQ functionality
2 parents d40b612 + 686bc28 commit a9f4f0d

File tree

3 files changed

+38
-0
lines changed

3 files changed

+38
-0
lines changed

Dockerfile-builder.template

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,20 @@ RUN set -eux; \
251251

252252
WORKDIR /usr/src/busybox
253253

254+
{{ if env.variant == "glibc" then ( -}}
255+
# https://github.com/docker-library/busybox/issues/198
256+
# https://bugs.busybox.net/show_bug.cgi?id=15931
257+
# https://bugs.debian.org/1071648
258+
RUN set -eux; \
259+
. /etc/os-release; \
260+
if [ "${ID:-}" = 'debian' ] && [ "${VERSION_CODENAME:-}" != 'bookworm' ]; then \
261+
curl -fL -o busybox-no-cbq.patch 'https://bugs.busybox.net/attachment.cgi?id=9751'; \
262+
echo '6671a12c48dbcefb653fc8403d1f103a1e2eba4a49b1ee9a9c27da8aa2db80d4 *busybox-no-cbq.patch' | sha256sum -c -; \
263+
patch -p1 --input=busybox-no-cbq.patch; \
264+
rm busybox-no-cbq.patch; \
265+
fi
266+
267+
{{ ) else "" end -}}
254268
RUN set -eux; \
255269
\
256270
# build date/time gets embedded in the BusyBox binary -- SOURCE_DATE_EPOCH should override that

latest-1/glibc/Dockerfile.builder

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/glibc/Dockerfile.builder

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)