Skip to content

Commit dd08936

Browse files
committed
Install s6-overlay via apk instead of downloading from GitHub
The manual download (curl + tar + xz) added build complexity and pinned to a specific release archive. Alpine's apk repository already packages s6-overlay, so using it simplifies the Dockerfile and delegates version management to the base image's package index.
1 parent c2a95d3 commit dd08936

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

docker/Dockerfile

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
ARG BUILDKIT_VERSION=v0.28.0
22
ARG CNI_VERSION=v1.9.0
33
ARG ALPINE_RELEASE=3.23
4-
ARG S6_OVERLAY_VERSION=v3.2.2.0
5-
64
# Prepare dependencies
75
FROM alpine:$ALPINE_RELEASE AS deps
86
ARG CNI_VERSION
@@ -21,22 +19,13 @@ LABEL org.opencontainers.image.title="buildcage" \
2119
org.opencontainers.image.source="https://github.com/dash14/buildcage"
2220

2321
RUN apk add --no-cache \
22+
s6-overlay \
2423
haproxy \
2524
dnsmasq \
2625
iptables \
2726
curl \
2827
quickjs
2928

30-
# s6-overlay
31-
ARG S6_OVERLAY_VERSION
32-
RUN apk add --no-cache xz && \
33-
S6_ARCH=$(uname -m) && \
34-
curl -fsSL "https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz" \
35-
| xz -d | tar -C / -xpf - && \
36-
curl -fsSL "https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.xz" \
37-
| xz -d | tar -C / -xpf - && \
38-
apk del xz
39-
4029
ENV S6_KEEP_ENV=1
4130
ENV S6_LOGGING=0
4231

0 commit comments

Comments
 (0)