From 7bf649c2a1674fa67b911acc8b8dff7b96406838 Mon Sep 17 00:00:00 2001
From: Kenta Kubo <601636+kkebo@users.noreply.github.com>
Date: Sun, 30 Mar 2025 15:31:18 +0900
Subject: [PATCH 1/2] Add `LD_LIBRARY_PATH` to Dockerfiles for Debian 12 and
 Fedora 39

This fixes the issue that you can not run executables built outside the container.
---
 nightly-6.1/debian/12/Dockerfile         | 1 +
 nightly-6.1/debian/12/buildx/Dockerfile  | 1 +
 nightly-6.1/fedora/39/Dockerfile         | 1 +
 nightly-6.1/fedora/39/buildx/Dockerfile  | 1 +
 nightly-main/debian/12/Dockerfile        | 1 +
 nightly-main/debian/12/buildx/Dockerfile | 1 +
 nightly-main/fedora/39/Dockerfile        | 1 +
 nightly-main/fedora/39/buildx/Dockerfile | 1 +
 8 files changed, 8 insertions(+)

diff --git a/nightly-6.1/debian/12/Dockerfile b/nightly-6.1/debian/12/Dockerfile
index 3ef97baa..c054cfa4 100644
--- a/nightly-6.1/debian/12/Dockerfile
+++ b/nightly-6.1/debian/12/Dockerfile
@@ -61,6 +61,7 @@ RUN set -e; \
     && 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
diff --git a/nightly-6.1/debian/12/buildx/Dockerfile b/nightly-6.1/debian/12/buildx/Dockerfile
index 38df7e01..0715eb1e 100644
--- a/nightly-6.1/debian/12/buildx/Dockerfile
+++ b/nightly-6.1/debian/12/buildx/Dockerfile
@@ -71,6 +71,7 @@ RUN set -e; \
     && 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
diff --git a/nightly-6.1/fedora/39/Dockerfile b/nightly-6.1/fedora/39/Dockerfile
index 7a6a6cf3..f7ca14da 100644
--- a/nightly-6.1/fedora/39/Dockerfile
+++ b/nightly-6.1/fedora/39/Dockerfile
@@ -63,6 +63,7 @@ RUN set -e; \
     && 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
diff --git a/nightly-6.1/fedora/39/buildx/Dockerfile b/nightly-6.1/fedora/39/buildx/Dockerfile
index 559d2171..2c10ae87 100644
--- a/nightly-6.1/fedora/39/buildx/Dockerfile
+++ b/nightly-6.1/fedora/39/buildx/Dockerfile
@@ -73,6 +73,7 @@ RUN set -e; \
     && 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
diff --git a/nightly-main/debian/12/Dockerfile b/nightly-main/debian/12/Dockerfile
index d8ef580b..a5ffcd5a 100644
--- a/nightly-main/debian/12/Dockerfile
+++ b/nightly-main/debian/12/Dockerfile
@@ -64,6 +64,7 @@ RUN set -e; \
     && 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
diff --git a/nightly-main/debian/12/buildx/Dockerfile b/nightly-main/debian/12/buildx/Dockerfile
index 080c6a36..d47e0b76 100644
--- a/nightly-main/debian/12/buildx/Dockerfile
+++ b/nightly-main/debian/12/buildx/Dockerfile
@@ -73,6 +73,7 @@ RUN set -e; \
     && 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
diff --git a/nightly-main/fedora/39/Dockerfile b/nightly-main/fedora/39/Dockerfile
index 678fbbb5..974484c4 100644
--- a/nightly-main/fedora/39/Dockerfile
+++ b/nightly-main/fedora/39/Dockerfile
@@ -63,6 +63,7 @@ RUN set -e; \
     && 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
\ No newline at end of file
diff --git a/nightly-main/fedora/39/buildx/Dockerfile b/nightly-main/fedora/39/buildx/Dockerfile
index 5cefaba3..22a1eadf 100644
--- a/nightly-main/fedora/39/buildx/Dockerfile
+++ b/nightly-main/fedora/39/buildx/Dockerfile
@@ -73,6 +73,7 @@ RUN set -e; \
     && 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
\ No newline at end of file

From 22a511bd855a556bf1c9d0b844146f6392a0ee87 Mon Sep 17 00:00:00 2001
From: Kenta Kubo <601636+kkebo@users.noreply.github.com>
Date: Thu, 10 Jul 2025 00:30:34 +0900
Subject: [PATCH 2/2] Add LD_LIBRARY_PATH to nightly-6.2 Dockerfiles for Debian
 12 and Fedora 39

---
 nightly-6.2/debian/12/Dockerfile        | 1 +
 nightly-6.2/debian/12/buildx/Dockerfile | 1 +
 nightly-6.2/fedora/39/Dockerfile        | 1 +
 nightly-6.2/fedora/39/buildx/Dockerfile | 1 +
 4 files changed, 4 insertions(+)

diff --git a/nightly-6.2/debian/12/Dockerfile b/nightly-6.2/debian/12/Dockerfile
index 74d212d8..e5992795 100644
--- a/nightly-6.2/debian/12/Dockerfile
+++ b/nightly-6.2/debian/12/Dockerfile
@@ -61,6 +61,7 @@ RUN set -e; \
     && 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
diff --git a/nightly-6.2/debian/12/buildx/Dockerfile b/nightly-6.2/debian/12/buildx/Dockerfile
index 2f9d797b..df505238 100644
--- a/nightly-6.2/debian/12/buildx/Dockerfile
+++ b/nightly-6.2/debian/12/buildx/Dockerfile
@@ -71,6 +71,7 @@ RUN set -e; \
     && 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
diff --git a/nightly-6.2/fedora/39/Dockerfile b/nightly-6.2/fedora/39/Dockerfile
index e94c3689..9eb0a96e 100644
--- a/nightly-6.2/fedora/39/Dockerfile
+++ b/nightly-6.2/fedora/39/Dockerfile
@@ -63,6 +63,7 @@ RUN set -e; \
     && 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
\ No newline at end of file
diff --git a/nightly-6.2/fedora/39/buildx/Dockerfile b/nightly-6.2/fedora/39/buildx/Dockerfile
index 59ed0737..448b2f48 100644
--- a/nightly-6.2/fedora/39/buildx/Dockerfile
+++ b/nightly-6.2/fedora/39/buildx/Dockerfile
@@ -73,6 +73,7 @@ RUN set -e; \
     && 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
\ No newline at end of file