Install binaries under $SWIFT_PREFIX/usr/bin instead of /usr/bin

This prevents some binaries from being unintentionally overwritten by the system package manager. Symbolic links are also placed in the old directory (`/usr/bin`) for compatibility.

Author: kkebo

6.0/amazonlinux/2/Dockerfile

@@ -32,12 +32,14 @@ ARG SWIFT_PLATFORM=amazonlinux2
 ARG SWIFT_BRANCH=swift-6.0.3-release
 ARG SWIFT_VERSION=swift-6.0.3-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
+ARG SWIFT_PREFIX=/opt/swift/6.0.3
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
     SWIFT_PLATFORM=$SWIFT_PLATFORM \
     SWIFT_BRANCH=$SWIFT_BRANCH \
     SWIFT_VERSION=$SWIFT_VERSION \
-    SWIFT_WEBROOT=$SWIFT_WEBROOT
+    SWIFT_WEBROOT=$SWIFT_WEBROOT \
+    SWIFT_PREFIX=$SWIFT_PREFIX
 
 RUN set -e; \
     ARCH_NAME="$(rpm --eval '%{_arch}')"; \
@@ -61,9 +63,15 @@ RUN set -e; \
     && gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
-    && tar -xzf swift.tar.gz --directory / --strip-components=1 \
-    && chmod -R o+r /usr/lib/swift \
+    && mkdir -p $SWIFT_PREFIX \
+    && tar -xzf swift.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \
+    && chmod -R o+r $SWIFT_PREFIX/usr/lib/swift \
+    # This is a compatibility workaround for those who expect `swift` to be in `/usr/bin/`.
+    && ln -sf $SWIFT_PREFIX/usr/bin/* /usr/bin/ \
     && rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz
 
+ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
+ENV LD_LIBRARY_PATH="${SWIFT_PREFIX}/usr/lib/swift/linux"
+
 # Print Installed Swift Version
 RUN swift --version

6.0/debian/12/Dockerfile

@@ -31,12 +31,14 @@ ARG SWIFT_PLATFORM=debian12
 ARG SWIFT_BRANCH=swift-6.0.3-release
 ARG SWIFT_VERSION=swift-6.0.3-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
+ARG SWIFT_PREFIX=/opt/swift/6.0.3
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
     SWIFT_PLATFORM=$SWIFT_PLATFORM \
     SWIFT_BRANCH=$SWIFT_BRANCH \
     SWIFT_VERSION=$SWIFT_VERSION \
-    SWIFT_WEBROOT=$SWIFT_WEBROOT
+    SWIFT_WEBROOT=$SWIFT_WEBROOT \
+    SWIFT_PREFIX=$SWIFT_PREFIX
 
 RUN set -e; \
     ARCH_NAME="$(dpkg --print-architecture)"; \
@@ -62,10 +64,16 @@ RUN set -e; \
     && gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
-    && tar -xzf swift.tar.gz --directory / --strip-components=1 \
-    && chmod -R o+r /usr/lib/swift \
+    && mkdir -p $SWIFT_PREFIX \
+    && tar -xzf swift.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \
+    && chmod -R o+r $SWIFT_PREFIX/usr/lib/swift \
+    # This is a compatibility workaround for those who expect `swift` to be in `/usr/bin/`.
+    && ln -sf $SWIFT_PREFIX/usr/bin/* /usr/bin/ \
     && rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz \
     && apt-get purge --auto-remove -y curl gpg
 
+ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
+ENV LD_LIBRARY_PATH="${SWIFT_PREFIX}/usr/lib/swift/linux"
+
 # Print Installed Swift Version
 RUN swift --version

6.0/fedora/39/Dockerfile

@@ -28,12 +28,14 @@ ARG SWIFT_PLATFORM=fedora39
 ARG SWIFT_BRANCH=swift-6.0.3-release
 ARG SWIFT_VERSION=swift-6.0.3-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
+ARG SWIFT_PREFIX=/opt/swift/6.0.3
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
     SWIFT_PLATFORM=$SWIFT_PLATFORM \
     SWIFT_BRANCH=$SWIFT_BRANCH \
     SWIFT_VERSION=$SWIFT_VERSION \
-    SWIFT_WEBROOT=$SWIFT_WEBROOT
+    SWIFT_WEBROOT=$SWIFT_WEBROOT \
+    SWIFT_PREFIX=$SWIFT_PREFIX
 
 RUN set -e; \
     ARCH_NAME="$(rpm --eval '%{_arch}')"; \
@@ -57,9 +59,15 @@ RUN set -e; \
     && gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
-    && tar -xzf swift.tar.gz --directory / --strip-components=1 \
-    && chmod -R o+r /usr/lib/swift \
+    && mkdir -p $SWIFT_PREFIX \
+    && tar -xzf swift.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \
+    && chmod -R o+r $SWIFT_PREFIX/usr/lib/swift \
+    # This is a compatibility workaround for those who expect `swift` to be in `/usr/bin/`.
+    && ln -sf $SWIFT_PREFIX/usr/bin/* /usr/bin/ \
     && rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz
 
+ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
+ENV LD_LIBRARY_PATH="${SWIFT_PREFIX}/usr/lib/swift/linux"
+
 # Print Installed Swift Version
 RUN swift --version

6.0/rhel-ubi/9/Dockerfile

@@ -26,12 +26,14 @@ ARG SWIFT_PLATFORM=ubi9
 ARG SWIFT_BRANCH=swift-6.0.3-release
 ARG SWIFT_VERSION=swift-6.0.3-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
+ARG SWIFT_PREFIX=/opt/swift/6.0.3
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
     SWIFT_PLATFORM=$SWIFT_PLATFORM \
     SWIFT_BRANCH=$SWIFT_BRANCH \
     SWIFT_VERSION=$SWIFT_VERSION \
-    SWIFT_WEBROOT=$SWIFT_WEBROOT
+    SWIFT_WEBROOT=$SWIFT_WEBROOT \
+    SWIFT_PREFIX=$SWIFT_PREFIX
 
 RUN set -e; \
     ARCH_NAME="$(rpm --eval '%{_arch}')"; \
@@ -55,9 +57,15 @@ RUN set -e; \
     && gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
-    && tar -xzf swift.tar.gz --directory / --strip-components=1 \
-    && chmod -R o+r /usr/lib/swift \
+    && mkdir -p $SWIFT_PREFIX \
+    && tar -xzf swift.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \
+    && chmod -R o+r $SWIFT_PREFIX/usr/lib/swift \
+    # This is a compatibility workaround for those who expect `swift` to be in `/usr/bin/`.
+    && ln -sf $SWIFT_PREFIX/usr/bin/* /usr/bin/ \
     && rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz
 
+ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
+ENV LD_LIBRARY_PATH="${SWIFT_PREFIX}/usr/lib/swift/linux"
+
 # Print Installed Swift Version
 RUN swift --version

6.0/ubuntu/20.04/Dockerfile

@@ -32,12 +32,14 @@ ARG SWIFT_PLATFORM=ubuntu20.04
 ARG SWIFT_BRANCH=swift-6.0.3-release
 ARG SWIFT_VERSION=swift-6.0.3-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
+ARG SWIFT_PREFIX=/opt/swift/6.0.3
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
     SWIFT_PLATFORM=$SWIFT_PLATFORM \
     SWIFT_BRANCH=$SWIFT_BRANCH \
     SWIFT_VERSION=$SWIFT_VERSION \
-    SWIFT_WEBROOT=$SWIFT_WEBROOT
+    SWIFT_WEBROOT=$SWIFT_WEBROOT \
+    SWIFT_PREFIX=$SWIFT_PREFIX
 
 RUN set -e; \
     ARCH_NAME="$(dpkg --print-architecture)"; \
@@ -63,10 +65,16 @@ RUN set -e; \
     && gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
-    && tar -xzf swift.tar.gz --directory / --strip-components=1 \
-    && chmod -R o+r /usr/lib/swift \
+    && mkdir -p $SWIFT_PREFIX \
+    && tar -xzf swift.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \
+    && chmod -R o+r $SWIFT_PREFIX/usr/lib/swift \
+    # This is a compatibility workaround for those who expect `swift` to be in `/usr/bin/`.
+    && ln -sf $SWIFT_PREFIX/usr/bin/* /usr/bin/ \
     && rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz \
     && apt-get purge --auto-remove -y curl
 
+ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
+ENV LD_LIBRARY_PATH="${SWIFT_PREFIX}/usr/lib/swift/linux"
+
 # Print Installed Swift Version
 RUN swift --version

6.0/ubuntu/22.04/Dockerfile

@@ -33,12 +33,14 @@ ARG SWIFT_PLATFORM=ubuntu22.04
 ARG SWIFT_BRANCH=swift-6.0.3-release
 ARG SWIFT_VERSION=swift-6.0.3-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
+ARG SWIFT_PREFIX=/opt/swift/6.0.3
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
     SWIFT_PLATFORM=$SWIFT_PLATFORM \
     SWIFT_BRANCH=$SWIFT_BRANCH \
     SWIFT_VERSION=$SWIFT_VERSION \
-    SWIFT_WEBROOT=$SWIFT_WEBROOT
+    SWIFT_WEBROOT=$SWIFT_WEBROOT \
+    SWIFT_PREFIX=$SWIFT_PREFIX
 
 RUN set -e; \
     ARCH_NAME="$(dpkg --print-architecture)"; \
@@ -64,10 +66,16 @@ RUN set -e; \
     && gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
-    && tar -xzf swift.tar.gz --directory / --strip-components=1 \
-    && chmod -R o+r /usr/lib/swift \
+    && mkdir -p $SWIFT_PREFIX \
+    && tar -xzf swift.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \
+    && chmod -R o+r $SWIFT_PREFIX/usr/lib/swift \
+    # This is a compatibility workaround for those who expect `swift` to be in `/usr/bin/`.
+    && ln -sf $SWIFT_PREFIX/usr/bin/* /usr/bin/ \
     && rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz \
     && apt-get purge --auto-remove -y curl
 
+ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
+ENV LD_LIBRARY_PATH="${SWIFT_PREFIX}/usr/lib/swift/linux"
+
 # Print Installed Swift Version
 RUN swift --version

6.0/ubuntu/24.04/Dockerfile

@@ -33,12 +33,14 @@ ARG SWIFT_PLATFORM=ubuntu24.04
 ARG SWIFT_BRANCH=swift-6.0.3-release
 ARG SWIFT_VERSION=swift-6.0.3-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
+ARG SWIFT_PREFIX=/opt/swift/6.0.3
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
     SWIFT_PLATFORM=$SWIFT_PLATFORM \
     SWIFT_BRANCH=$SWIFT_BRANCH \
     SWIFT_VERSION=$SWIFT_VERSION \
-    SWIFT_WEBROOT=$SWIFT_WEBROOT
+    SWIFT_WEBROOT=$SWIFT_WEBROOT \
+    SWIFT_PREFIX=$SWIFT_PREFIX
 
 RUN set -e; \
     ARCH_NAME="$(dpkg --print-architecture)"; \
@@ -64,10 +66,16 @@ RUN set -e; \
     && gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
-    && tar -xzf swift.tar.gz --directory / --strip-components=1 \
-    && chmod -R o+r /usr/lib/swift \
+    && mkdir -p $SWIFT_PREFIX \
+    && tar -xzf swift.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \
+    && chmod -R o+r $SWIFT_PREFIX/usr/lib/swift \
+    # This is a compatibility workaround for those who expect `swift` to be in `/usr/bin/`.
+    && ln -sf $SWIFT_PREFIX/usr/bin/* /usr/bin/ \
     && rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz \
     && apt-get purge --auto-remove -y curl
 
+ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
+ENV LD_LIBRARY_PATH="${SWIFT_PREFIX}/usr/lib/swift/linux"
+
 # Print Installed Swift Version
 RUN swift --version

nightly-6.1/amazonlinux/2/Dockerfile

@@ -33,13 +33,16 @@ RUN yum -y install \
 ARG SWIFT_SIGNING_KEY=E813C892820A6FA13755B268F167DF1ACF9CE069
 ARG SWIFT_PLATFORM=amazonlinux
 ARG OS_MAJOR_VER=2
+ARG SWIFT_VERSION=6.1
 ARG SWIFT_WEBROOT=https://download.swift.org/swift-6.1-branch
+ARG SWIFT_PREFIX=/opt/swift/${SWIFT_VERSION}
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
     SWIFT_PLATFORM=$SWIFT_PLATFORM \
     OS_MAJOR_VER=$OS_MAJOR_VER \
     OS_VER=$SWIFT_PLATFORM$OS_MAJOR_VER \
-    SWIFT_WEBROOT="$SWIFT_WEBROOT/$SWIFT_PLATFORM$OS_MAJOR_VER"
+    SWIFT_WEBROOT="$SWIFT_WEBROOT/$SWIFT_PLATFORM$OS_MAJOR_VER" \
+    SWIFT_PREFIX=$SWIFT_PREFIX
 
 RUN echo "${SWIFT_WEBROOT}/latest-build.yml"
 
@@ -56,10 +59,16 @@ RUN set -e; \
     && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import -  \
     && gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
-    && tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \
-    && chmod -R o+r /usr/lib/swift \
+    && mkdir -p $SWIFT_PREFIX \
+    && tar -xzf latest_toolchain.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \
+    && chmod -R o+r $SWIFT_PREFIX/usr/lib/swift \
+    # This is a compatibility workaround for those who expect `swift` to be in `/usr/bin/`.
+    && ln -sf $SWIFT_PREFIX/usr/bin/* /usr/bin/ \
     && rm -rf "$GNUPGHOME" latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
 
+ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
+ENV LD_LIBRARY_PATH="${SWIFT_PREFIX}/usr/lib/swift/linux"
+
 # Print Installed Swift Version
 RUN swift --version
 

nightly-6.1/amazonlinux/2/buildx/Dockerfile

@@ -32,7 +32,9 @@ RUN yum -y install \
 ARG SWIFT_SIGNING_KEY=E813C892820A6FA13755B268F167DF1ACF9CE069
 ARG SWIFT_PLATFORM=amazonlinux
 ARG OS_MAJOR_VER=2
+ARG SWIFT_VERSION=6.1
 ARG SWIFT_WEBROOT=https://download.swift.org/swift-6.1-branch
+ARG SWIFT_PREFIX=/opt/swift/${SWIFT_VERSION}
 
 # This is a small trick to enable if/else for arm64 and amd64.
 # Because of https://bugs.swift.org/browse/SR-14872 we need adjust tar options.
@@ -46,6 +48,7 @@ FROM base-$TARGETARCH AS final
 
 ARG OS_VER=$SWIFT_PLATFORM$OS_MAJOR_VER$OS_ARCH_SUFFIX
 ARG PLATFORM_WEBROOT="$SWIFT_WEBROOT/$SWIFT_PLATFORM$OS_MAJOR_VER$OS_ARCH_SUFFIX"
+ENV SWIFT_PREFIX=$SWIFT_PREFIX
 
 RUN echo "${PLATFORM_WEBROOT}/latest-build.yml"
 
@@ -62,10 +65,16 @@ RUN set -e; \
     && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import -  \
     && gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
-    && tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \
-    && chmod -R o+r /usr/lib/swift \
+    && mkdir -p $SWIFT_PREFIX \
+    && tar -xzf latest_toolchain.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \
+    && chmod -R o+r $SWIFT_PREFIX/usr/lib/swift \
+    # This is a compatibility workaround for those who expect `swift` to be in `/usr/bin/`.
+    && ln -sf $SWIFT_PREFIX/usr/bin/* /usr/bin/ \
     && rm -rf "$GNUPGHOME" latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
 
+ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
+ENV LD_LIBRARY_PATH="${SWIFT_PREFIX}/usr/lib/swift/linux"
+
 # Print Installed Swift Version
 RUN swift --version
 

nightly-6.1/rhel-ubi/9/Dockerfile

@@ -26,13 +26,16 @@ RUN yum install -y  \
 ARG SWIFT_SIGNING_KEY=E813C892820A6FA13755B268F167DF1ACF9CE069
 ARG SWIFT_PLATFORM=ubi
 ARG OS_MAJOR_VER=9
+ARG SWIFT_VERSION=6.1
 ARG SWIFT_WEBROOT=https://download.swift.org/swift-6.1-branch
+ARG SWIFT_PREFIX=/opt/swift/${SWIFT_VERSION}
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
     SWIFT_PLATFORM=$SWIFT_PLATFORM \
     OS_MAJOR_VER=$OS_MAJOR_VER \
     OS_VER=$SWIFT_PLATFORM$OS_MAJOR_VER \
-    SWIFT_WEBROOT="$SWIFT_WEBROOT/$SWIFT_PLATFORM$OS_MAJOR_VER"
+    SWIFT_WEBROOT="$SWIFT_WEBROOT/$SWIFT_PLATFORM$OS_MAJOR_VER" \
+    SWIFT_PREFIX=$SWIFT_PREFIX
 
 RUN echo "${SWIFT_WEBROOT}/latest-build.yml"
 
@@ -49,10 +52,16 @@ RUN set -e; \
     && curl -fL https://swift.org/keys/all-keys.asc | gpg --import -  \
     && gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
-    && tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \
-    && chmod -R o+r /usr/lib/swift \
+    && mkdir -p $SWIFT_PREFIX \
+    && tar -xzf latest_toolchain.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \
+    && chmod -R o+r $SWIFT_PREFIX/usr/lib/swift \
+    # This is a compatibility workaround for those who expect `swift` to be in `/usr/bin/`.
+    && ln -sf $SWIFT_PREFIX/usr/bin/* /usr/bin/ \
     && rm -rf "$GNUPGHOME" latest_toolchain.tar.gz.sig latest_toolchain.tar.gz
 
+ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
+ENV LD_LIBRARY_PATH="${SWIFT_PREFIX}/usr/lib/swift/linux"
+
 # Print Installed Swift Version
 RUN swift --version
 

nightly-6.1/rhel-ubi/9/buildx/Dockerfile

@@ -25,7 +25,9 @@ RUN yum install -y  \
 ARG SWIFT_SIGNING_KEY=E813C892820A6FA13755B268F167DF1ACF9CE069
 ARG SWIFT_PLATFORM=ubi
 ARG OS_MAJOR_VER=9
+ARG SWIFT_VERSION=6.1
 ARG SWIFT_WEBROOT=https://download.swift.org/swift-6.1-branch
+ARG SWIFT_PREFIX=/opt/swift/${SWIFT_VERSION}
 
 # This is a small trick to enable if/else for arm64 and amd64.
 # Because of https://bugs.swift.org/browse/SR-14872 we need adjust tar options.
@@ -39,6 +41,7 @@ FROM base-$TARGETARCH AS final
 
 ARG OS_VER=$SWIFT_PLATFORM$OS_MAJOR_VER$OS_ARCH_SUFFIX
 ARG PLATFORM_WEBROOT="$SWIFT_WEBROOT/$SWIFT_PLATFORM$OS_MAJOR_VER$OS_ARCH_SUFFIX"
+ENV SWIFT_PREFIX=$SWIFT_PREFIX
 
 RUN echo "${PLATFORM_WEBROOT}/latest-build.yml"
 
@@ -55,10 +58,16 @@ RUN set -e; \
     && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import -  \
     && gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
-    && tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \
-    && chmod -R o+r /usr/lib/swift \
+    && mkdir -p $SWIFT_PREFIX \
+    && tar -xzf latest_toolchain.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \
+    && chmod -R o+r $SWIFT_PREFIX/usr/lib/swift \
+    # This is a compatibility workaround for those who expect `swift` to be in `/usr/bin/`.
+    && ln -sf $SWIFT_PREFIX/usr/bin/* /usr/bin/ \
     && rm -rf "$GNUPGHOME" latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
 
+ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
+ENV LD_LIBRARY_PATH="${SWIFT_PREFIX}/usr/lib/swift/linux"
+
 # Print Installed Swift Version
 RUN swift --version