Merge branch 'master' of github.com:SaptarshiSarkar12/Drifty into 280…

…-add-splash-screen
SaptarshiSarkar12 · Dec 28, 2023 · 4878c7a · 4878c7a
2 parents b392ee9 + c14ce67
commit 4878c7a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/Docker/dev/GUI/Dockerfile b/Docker/dev/GUI/Dockerfile
@@ -19,5 +19,5 @@ RUN mvn -P build-drifty-gui-for-ubuntu-latest gluonfx:build gluonfx:package -rf
 FROM drifty-runner:latest
 WORKDIR /app
 COPY --from=build /app/GUI/target/gluonfx/x86_64-linux /app
-
-CMD [ "/app/GUI" ]
+RUN chmod +x /app/GUI
+CMD ["/app/GUI"]
diff --git a/Docker/dev/commons/base/Dockerfile b/Docker/dev/commons/base/Dockerfile
@@ -13,15 +13,14 @@ RUN apt-get install gcc build-essential -y && \
 
 # Download and install Maven 3.8.8 GraalVM
 RUN wget https://apache.osuosl.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz && \
-    wget https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-20.0.2/graalvm-community-jdk-20.0.2_linux-x64_bin.tar.gz && \
+    wget https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_linux-x64_bin.tar.gz && \
     tar -xzf apache-maven-3.8.8-bin.tar.gz && \
-    tar -xzf graalvm-community-jdk-20.0.2_linux-x64_bin.tar.gz &&\
+    tar -xzf graalvm-community-jdk-21.0.1_linux-x64_bin.tar.gz &&\
     rm apache-maven-3.8.8-bin.tar.gz && \
-    rm graalvm-community-jdk-20.0.2_linux-x64_bin.tar.gz
+    rm graalvm-community-jdk-21.0.1_linux-x64_bin.tar.gz
 
 # Setting environment variables
 ENV PATH="/build/apache-maven-3.8.8/bin:$PATH"
-ENV JAVA_HOME="/build/graalvm-community-openjdk-20.0.2+9.1"
-ENV GRAALVM_HOME="/build/graalvm-community-openjdk-20.0.2+9.1"
-ENV PATH="/build/graalvm-community-openjdk-20.0.2+9.1/bin:$PATH"
-
+ENV JAVA_HOME="/build/graalvm-community-openjdk-21.0.1+12.1"
+ENV GRAALVM_HOME="/build/graalvm-community-openjdk-21.0.1+12.1"
+ENV PATH="/build/graalvm-community-openjdk-21.0.1+12.1/bin:$PATH"