From 655599077eed4a6dcd44a87af4b4799523679b7d Mon Sep 17 00:00:00 2001
From: AbdAlRahman Gad <89566409+AbdAlRahmanGad@users.noreply.github.com>
Date: Thu, 10 Oct 2024 03:26:03 +0000
Subject: [PATCH] Fix build with docker issues

- fix `install_untested_nightly_swift.sh` name in Dockerfile
- add `curl` to the Dockerfile
- fix `java` and `JAVA_HOME` path

Signed-off-by: AbdAlRahman Gad <abdobngad@gmail.com>
---
 docker/Dockerfile          | 6 ++++--
 docker/docker-compose.yaml | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 216e3108..0660f117 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -10,7 +10,8 @@ ARG ubuntu_version
 RUN apt-get update && apt-get install -y \
     locales locales-all \
     make \
-    libc6-dev
+    libc6-dev \
+    curl
 ENV LC_ALL=en_US.UTF-8
 ENV LANG=en_US.UTF-8
 ENV LANGUAGE=en_US.UTF-8
@@ -23,4 +24,5 @@ ENV PATH="$PATH:/usr/lib/jvm/default-jdk/bin"
 
 # Install "untested" nightly 'main' Swift
 # TODO: Only do this if the released Swift is older than what we require
-RUN bash -xc './install_nightly_untested_swift.sh'
+COPY install_untested_nightly_swift.sh .
+RUN bash -xc './install_untested_nightly_swift.sh'
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index a2097226..6bfe52d0 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -17,7 +17,7 @@ services:
       - ..:/swift-java:z
     working_dir: /swift-java
     environment:
-      JAVA_HOME: /jdk
+      JAVA_HOME: /usr/lib/jvm/default-jdk
 
   soundness:
     <<: *common
@@ -29,15 +29,15 @@ services:
 
   test-swift:
     <<: *common
-    command: /bin/bash -xcl "uname -a && swift -version && /jdk/bin/java -version && swift $${SWIFT_TEST_VERB-test} $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-}"
+    command: /bin/bash -xcl "uname -a && swift -version && java -version && swift $${SWIFT_TEST_VERB-test} $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-}"
 
   test-java:
     <<: *common
-    command: /bin/bash -xcl "uname -a && swift -version && /jdk/bin/java -version && make jextract-run && ./gradlew test --debug"
+    command: /bin/bash -xcl "uname -a && swift -version && java -version && make jextract-run && ./gradlew test --debug"
 
   test:
     <<: *common
-    command: /bin/bash -xcl "uname -a && swift -version && /jdk/bin/java -version && make jextract-run && swift $${SWIFT_TEST_VERB-test} $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-} && ./gradlew test --debug"
+    command: /bin/bash -xcl "uname -a && swift -version && java -version && make jextract-run && swift $${SWIFT_TEST_VERB-test} $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-} && ./gradlew test --debug"
 
   # util