From 4838bf2a847a5816f55b47742c874234b6cf840c Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Wed, 24 Sep 2025 19:59:28 -0700 Subject: [PATCH] alpine: fix issue with openssh pkg in 3.22 Signed-off-by: Tonis Tiigi --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 713380c3a..2ece231b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -203,7 +203,7 @@ FROM scratch AS release COPY --link --from=releaser /out/ / FROM alpine:${ALPINE_VERSION} AS buildkit-export-alpine -RUN apk add --no-cache fuse3 git openssh pigz xz iptables ip6tables \ +RUN apk add --no-cache fuse3 git openssh openssl pigz xz iptables ip6tables \ && ln -s fusermount3 /usr/bin/fusermount COPY --link examples/buildctl-daemonless/buildctl-daemonless.sh /usr/bin/ VOLUME /var/lib/buildkit @@ -214,6 +214,7 @@ RUN apt-get update \ fuse3 \ git \ openssh-client \ + openssl \ pigz \ xz-utils \ iptables \ @@ -411,7 +412,7 @@ COPY --link --from=binaries / / FROM buildkit-base AS integration-tests-base ENV BUILDKIT_INTEGRATION_ROOTLESS_IDPAIR="1000:1000" -RUN apk add --no-cache shadow shadow-uidmap sudo vim iptables ip6tables dnsmasq fuse curl git-daemon openssh-client slirp4netns iproute2 \ +RUN apk add --no-cache shadow shadow-uidmap sudo vim iptables ip6tables dnsmasq fuse curl git-daemon openssh-client openssl slirp4netns iproute2 \ && useradd --create-home --home-dir /home/user --uid 1000 -s /bin/sh user \ && echo "XDG_RUNTIME_DIR=/run/user/1000; export XDG_RUNTIME_DIR" >> /home/user/.profile \ && mkdir -m 0700 -p /run/user/1000 \ @@ -460,7 +461,7 @@ VOLUME /var/lib/buildkit # rootless builds a rootless variant of buildkitd image FROM alpine:${ALPINE_VERSION} AS rootless -RUN apk add --no-cache fuse3 fuse-overlayfs git openssh pigz shadow-uidmap xz +RUN apk add --no-cache fuse3 fuse-overlayfs git openssh openssl pigz shadow-uidmap xz RUN adduser -D -u 1000 user \ && mkdir -p /run/user/1000 /home/user/.local/tmp /home/user/.local/share/buildkit \ && chown -R user /run/user/1000 /home/user \