From 8eabbcee9779fbbc8b47d0b0fc3833d9170cb4c2 Mon Sep 17 00:00:00 2001 From: Nick Lockwood Date: Wed, 27 Nov 2024 01:27:40 +0000 Subject: [PATCH] Revert "Use busybox for runner base (#1934)" This reverts commit 8d3db338b447a60cba0cc673058d0d9821689054. --- Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index c7718a34c..44ebeecee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ # syntax=docker/dockerfile:1 # Base image and static SDK have to be updated together. -FROM --platform=$BUILDPLATFORM swift:6.0.2 AS builder +FROM --platform=$BUILDPLATFORM swift:6.0.1 AS builder WORKDIR /workspace RUN swift sdk install \ - https://download.swift.org/swift-6.0.2-release/static-sdk/swift-6.0.2-RELEASE/swift-6.0.2-RELEASE_static-linux-0.0.1.artifactbundle.tar.gz \ - --checksum aa5515476a403797223fc2aad4ca0c3bf83995d5427fb297cab1d93c68cee075 + https://download.swift.org/swift-6.0.1-release/static-sdk/swift-6.0.1-RELEASE/swift-6.0.1-RELEASE_static-linux-0.0.1.artifactbundle.tar.gz \ + --checksum d4f46ba40e11e697387468e18987ee622908bc350310d8af54eb5e17c2ff5481 COPY . /workspace ARG TARGETPLATFORM @@ -13,8 +13,7 @@ RUN --mount=type=cache,target=/workspace/.build,id=build-$TARGETPLATFORM \ ./Scripts/build-linux-release.sh && \ cp /workspace/.build/release/swiftformat /workspace -# https://github.com/nicklockwood/SwiftFormat/issues/1930 -FROM busybox:stable AS runner +FROM scratch AS runner COPY --from=builder /workspace/swiftformat /usr/bin/swiftformat ENTRYPOINT [ "/usr/bin/swiftformat" ] CMD ["."]