Monthly chore: Fix build by updating busybox again (sourcegraph#28894)

shershams · Dec 13, 2021 · b5b6496 · b5b6496
1 parent fd99e49
commit b5b6496
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/docker-images/alpine-3.12/Dockerfile b/docker-images/alpine-3.12/Dockerfile
@@ -26,7 +26,7 @@ RUN addgroup -g 101 -S sourcegraph && adduser -u 100 -S -G sourcegraph -h /home/
 RUN apk update && apk add --no-cache \
     bind-tools \
     # Requires the use of the edge repo for CVE-2021-28831 until a patched version is brought into the 3.12 mirror.
-    'busybox=1.34.1-r3' --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
+    'busybox=1.34.1-r4' --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
     ca-certificates \
     curl \
     mailcap \

diff --git a/docker-images/alpine-3.14/Dockerfile b/docker-images/alpine-3.14/Dockerfile
@@ -26,7 +26,7 @@ RUN addgroup -g 101 -S sourcegraph && adduser -u 100 -S -G sourcegraph -h /home/
 RUN apk update && apk add --no-cache \
     bind-tools \
     # Requires the use of the edge repo for CVE-2021-28831 until a patched version is brought into the 3.12 mirror.
-    'busybox=1.34.1-r3' --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
+    'busybox=1.34.1-r4' --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
     ca-certificates \
     curl \
     mailcap \

diff --git a/docker-images/cadvisor/Dockerfile b/docker-images/cadvisor/Dockerfile
@@ -14,7 +14,7 @@ LABEL org.opencontainers.image.documentation=https://docs.sourcegraph.com/
 
 RUN apk add --upgrade --no-cache apk-tools=2.10.8-r0 krb5-libs=1.18.4-r0 \
     # Requires the use of the edge repo for CVE-2021-28831 until a patched version is brought into the 3.12 mirror. 
-    'busybox=1.34.1-r3' --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
+    'busybox=1.34.1-r4' --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
     # Required due to ssl_clent upgrade with busybox
     'wget=1.21.1-r1' --repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/main
 

diff --git a/docker-images/codeinsights-db/Dockerfile b/docker-images/codeinsights-db/Dockerfile
@@ -3,7 +3,7 @@ FROM timescale/timescaledb:2.0.0-pg12-oss
 # hadolint ignore=DL3017
 RUN apk -U upgrade && apk add --no-cache \  
     # Requires the use of the edge repo for CVE-2021-28831 until a patched version is brought into the 3.12 mirror. 
-    'busybox=1.34.1-r3' --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
+    'busybox=1.34.1-r4' --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
     # Required due to ssl_clent upgrade with busybox
     'wget=1.21.1-r1' --repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/main