From aa3670c64671895c843a36312266c1741b16807e 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 ed7da96c..fd5096d7 100644
--- a/nightly-6.1/debian/12/Dockerfile
+++ b/nightly-6.1/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"
 
 USER build-user
 
diff --git a/nightly-6.1/debian/12/buildx/Dockerfile b/nightly-6.1/debian/12/buildx/Dockerfile
index eb994748..80425887 100644
--- a/nightly-6.1/debian/12/buildx/Dockerfile
+++ b/nightly-6.1/debian/12/buildx/Dockerfile
@@ -74,6 +74,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"
 
 USER build-user
 
diff --git a/nightly-6.1/fedora/39/Dockerfile b/nightly-6.1/fedora/39/Dockerfile
index bf9b451d..1942f01e 100644
--- a/nightly-6.1/fedora/39/Dockerfile
+++ b/nightly-6.1/fedora/39/Dockerfile
@@ -66,6 +66,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"
 
 USER build-user
 
diff --git a/nightly-6.1/fedora/39/buildx/Dockerfile b/nightly-6.1/fedora/39/buildx/Dockerfile
index 0346612b..22fc7053 100644
--- a/nightly-6.1/fedora/39/buildx/Dockerfile
+++ b/nightly-6.1/fedora/39/buildx/Dockerfile
@@ -76,6 +76,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"
 
 USER build-user
 
diff --git a/nightly-main/debian/12/Dockerfile b/nightly-main/debian/12/Dockerfile
index 9df2b8e9..a736d8eb 100644
--- a/nightly-main/debian/12/Dockerfile
+++ b/nightly-main/debian/12/Dockerfile
@@ -67,6 +67,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"
 
 USER build-user
 
diff --git a/nightly-main/debian/12/buildx/Dockerfile b/nightly-main/debian/12/buildx/Dockerfile
index 39934fc3..7ff37259 100644
--- a/nightly-main/debian/12/buildx/Dockerfile
+++ b/nightly-main/debian/12/buildx/Dockerfile
@@ -76,6 +76,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"
 
 USER build-user
 
diff --git a/nightly-main/fedora/39/Dockerfile b/nightly-main/fedora/39/Dockerfile
index 96463d8e..6434cafb 100644
--- a/nightly-main/fedora/39/Dockerfile
+++ b/nightly-main/fedora/39/Dockerfile
@@ -66,6 +66,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"
 
 USER build-user
 
diff --git a/nightly-main/fedora/39/buildx/Dockerfile b/nightly-main/fedora/39/buildx/Dockerfile
index e2ccbe5b..f65fd946 100644
--- a/nightly-main/fedora/39/buildx/Dockerfile
+++ b/nightly-main/fedora/39/buildx/Dockerfile
@@ -76,6 +76,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"
 
 USER build-user
 

From f4e3f9de158677ee307ee677e66e18a40ba02ff2 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 9cc79df6..07f48747 100644
--- a/nightly-6.2/debian/12/Dockerfile
+++ b/nightly-6.2/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"
 
 USER build-user
 
diff --git a/nightly-6.2/debian/12/buildx/Dockerfile b/nightly-6.2/debian/12/buildx/Dockerfile
index 5a914861..6698193d 100644
--- a/nightly-6.2/debian/12/buildx/Dockerfile
+++ b/nightly-6.2/debian/12/buildx/Dockerfile
@@ -74,6 +74,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"
 
 USER build-user
 
diff --git a/nightly-6.2/fedora/39/Dockerfile b/nightly-6.2/fedora/39/Dockerfile
index 0f2a8db7..8bde50df 100644
--- a/nightly-6.2/fedora/39/Dockerfile
+++ b/nightly-6.2/fedora/39/Dockerfile
@@ -66,6 +66,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"
 
 USER build-user
 
diff --git a/nightly-6.2/fedora/39/buildx/Dockerfile b/nightly-6.2/fedora/39/buildx/Dockerfile
index ca10cd5a..42a66d61 100644
--- a/nightly-6.2/fedora/39/buildx/Dockerfile
+++ b/nightly-6.2/fedora/39/buildx/Dockerfile
@@ -76,6 +76,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"
 
 USER build-user