From c051492e649571a60984c4ca2c748bcd5c2859d6 Mon Sep 17 00:00:00 2001 From: Konrad `ktoso` Malawski Date: Tue, 5 Aug 2025 23:04:25 +0900 Subject: [PATCH 1/2] Update Dockerfile Update dockerfile to install corretto 24 and swiftly. This is the simplest way to get a local linux env for debuggign. --- docker/Dockerfile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 06b17a87..870e1ef8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -18,9 +18,13 @@ ENV LC_ALL=en_US.UTF-8 ENV LANG=en_US.UTF-8 ENV LANGUAGE=en_US.UTF-8 -COPY install_jdk.sh . - # JDK dependency -RUN bash -xc 'JDK_VENDOR=corretto ./install_jdk.sh' -ENV JAVA_HOME="/usr/lib/jvm/default-jdk" -ENV PATH="$PATH:/usr/lib/jvm/default-jdk/bin" +RUN curl -s "https://get.sdkman.io" | bash +RUN source "/root/.sdkman/bin/sdkman-init.sh" && sdk install java 24.0.1-amzn --use + +RUN curl -O https://download.swift.org/swiftly/linux/swiftly-$(uname -m).tar.gz && \ + tar zxf swiftly-$(uname -m).tar.gz && \ + ./swiftly init --quiet-shell-followup --assume-yes && \ + . "${SWIFTLY_HOME_DIR:-$HOME/.local/share/swiftly}/env.sh" && \ + hash -r + From 863cb611c92341be7b543bc59cef9a276f374342 Mon Sep 17 00:00:00 2001 From: Konrad `ktoso` Malawski Date: Tue, 5 Aug 2025 23:21:50 +0900 Subject: [PATCH 2/2] Update Dockerfile --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 870e1ef8..c3568b54 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -20,7 +20,7 @@ ENV LANGUAGE=en_US.UTF-8 # JDK dependency RUN curl -s "https://get.sdkman.io" | bash -RUN source "/root/.sdkman/bin/sdkman-init.sh" && sdk install java 24.0.1-amzn --use +RUN bash -c "source /root/.sdkman/bin/sdkman-init.sh && sdk install java 24.0.1-amzn" RUN curl -O https://download.swift.org/swiftly/linux/swiftly-$(uname -m).tar.gz && \ tar zxf swiftly-$(uname -m).tar.gz && \