Skip to content

Commit

Permalink
Merge branch 'master' of github.com:beehive-lab/docker-tornado
Browse files Browse the repository at this point in the history
  • Loading branch information
jjfumero committed Jun 15, 2023
2 parents fdbd3fc + ac3ab6f commit 86e4bce
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

TAG_VERSION=0.15.1-dev
TAG_VERSION=0.15.1

function buildDockerImage() {
IMAGE=$1
Expand Down
2 changes: 1 addition & 1 deletion dockerFiles/Dockerfile.nvidia.graalvm.jdk17
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN ./scripts/tornadovm-installer --jdk graalvm-jdk-17 --backend opencl
SHELL ["/bin/bash", "-c", "source /tornado/tornado/source.sh"]

## ENV-Variables Taken from the SOURCE.sh
ENV JAVA_HOME=/tornado/tornado/etc/dependencies/TornadoVM-graalvm-jdk-17/graalvm-ce-java17-22.3.1
ENV JAVA_HOME=/tornado/tornado/etc/dependencies/TornadoVM-graalvm-jdk-17/graalvm-ce-java17-22.3.2
ENV PATH=/tornado/tornado/bin/bin:$PATH
ENV TORNADO_SDK=/tornado/tornado/bin/sdk
ENV TORNADO_ROOT=/tornado/tornado
Expand Down
2 changes: 1 addition & 1 deletion dockerFiles/Dockerfile.nvidia.jdk17
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN ./scripts/tornadovm-installer --jdk jdk17 --backend opencl
SHELL ["/bin/bash", "-c", "source /tornado/tornado/source.sh"]

## ENV-Variables Taken from the SOURCE.sh
ENV JAVA_HOME=/tornado/tornado/etc/dependencies/TornadoVM-jdk17/jdk-17.0.6
ENV JAVA_HOME=/tornado/tornado/etc/dependencies/TornadoVM-jdk17/jdk-17.0.7
ENV PATH=/tornado/tornado/bin/bin:$PATH
ENV TORNADO_SDK=/tornado/tornado/bin/sdk
ENV TORNADO_ROOT=/tornado/tornado
Expand Down
2 changes: 1 addition & 1 deletion dockerFiles/Dockerfile.oneapi.intel.graalvm.jdk17
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN ./scripts/tornadovm-installer --jdk graalvm-jdk-17 --backend opencl,spirv
SHELL ["/bin/bash", "-c", "source /tornado/tornado/source.sh"]

## ENV-Variables Taken from the SOURCE.sh
ENV JAVA_HOME=/tornado/tornado/etc/dependencies/TornadoVM-graalvm-jdk-17/graalvm-ce-java17-22.3.1
ENV JAVA_HOME=/tornado/tornado/etc/dependencies/TornadoVM-graalvm-jdk-17/graalvm-ce-java17-22.3.2
ENV PATH=/tornado/tornado/bin/bin:$PATH
ENV TORNADO_SDK=/tornado/tornado/bin/sdk
ENV TORNADO_ROOT=/tornado/tornado
Expand Down
2 changes: 1 addition & 1 deletion dockerFiles/Dockerfile.oneapi.intel.jdk17
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN ./scripts/tornadovm-installer --jdk jdk17 --backend opencl,spirv
SHELL ["/bin/bash", "-c", "source /tornado/tornado/source.sh"]

## ENV-Variables Taken from the SOURCE.sh
ENV JAVA_HOME=/tornado/tornado/etc/dependencies/TornadoVM-jdk17/jdk-17.0.6
ENV JAVA_HOME=/tornado/tornado/etc/dependencies/TornadoVM-jdk17/jdk-17.0.7
ENV PATH=/tornado/tornado/bin/bin:$PATH
ENV TORNADO_SDK=/tornado/tornado/bin/sdk
ENV TORNADO_ROOT=/tornado/tornado
Expand Down
2 changes: 1 addition & 1 deletion example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit 86e4bce

Please sign in to comment.