Merge pull request #60 from AbdAlRahmanGad/docker

Author: ktoso

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'

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