@@ -55,25 +55,25 @@ RUN set -e; \
55
55
;; \
56
56
*) echo >&2 "error: unsupported architecture: '$ARCH_NAME'" ; exit 1 ;; \
57
57
esac; \
58
- SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)$OS_ARCH_SUFFIX" \
59
- && SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_TAG/$SWIFT_TAG-$SWIFT_PLATFORM$OS_ARCH_SUFFIX.tar.gz" \
60
- && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
58
+ # SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)$OS_ARCH_SUFFIX" \
59
+ # && SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_TAG/$SWIFT_TAG-$SWIFT_PLATFORM$OS_ARCH_SUFFIX.tar.gz" \
60
+ # && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
61
61
# - Grab curl here so we cache better up above
62
- && export DEBIAN_FRONTEND=noninteractive \
63
- && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
62
+ # && export DEBIAN_FRONTEND=noninteractive \
63
+ # && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
64
64
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
65
- && export GNUPGHOME="$(mktemp -d)" \
66
- && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
67
- && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
68
- && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
65
+ # && export GNUPGHOME="$(mktemp -d)" \
66
+ # && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
67
+ # && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
68
+ # && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
69
69
# - Unpack the toolchain, set libs permissions, and clean up.
70
- && mkdir -p $SWIFT_PREFIX \
71
- && tar -xzf swift.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \
72
- && chmod -R o+r $SWIFT_PREFIX/usr/lib/swift \
73
- && rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz \
74
- && apt-get purge --auto-remove -y curl
70
+ # && mkdir -p $SWIFT_PREFIX \
71
+ # && tar -xzf swift.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \
72
+ # && chmod -R o+r $SWIFT_PREFIX/usr/lib/swift \
73
+ # && rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz \
74
+ # && apt-get purge --auto-remove -y curl
75
75
76
- ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
76
+ # ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
77
77
78
78
USER build-user
79
79
0 commit comments