From 38afd46a68ffb176a7995dc2dcd207c5daeb5dc7 Mon Sep 17 00:00:00 2001
From: Mani Sarkar <sadhak001@gmail.com>
Date: Wed, 20 Oct 2021 00:10:29 +0100
Subject: [PATCH] Changing GRAALVM_HOME to /opt/graalvm and using the variable
 when copying the layer from a ready-to-use graalvm docker image

---
 docker-images/Dockerfile          | 5 +++--
 docker-images/Dockerfile-mn       | 5 +++--
 docker-images/buildDockerImage.sh | 2 +-
 runDockerImage.sh                 | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docker-images/Dockerfile b/docker-images/Dockerfile
index 4f4f9e71e..d10c28fe3 100644
--- a/docker-images/Dockerfile
+++ b/docker-images/Dockerfile
@@ -36,10 +36,11 @@ RUN echo; echo "List of installed locales:"; locale -a; echo;
 RUN echo "gcc version: "; gcc --version
 RUN echo "make version: "; make --version
 
+ARG GRAALVM_HOME
+
 # Install and setup GraalVM
-COPY --from=graalvm-jdk-image /opt/graalvm-* /graalvm
+COPY --from=graalvm-jdk-image /opt/graalvm-* ${GRAALVM_HOME}
 
-ARG GRAALVM_HOME
 ENV JAVA_HOME=${GRAALVM_HOME}
 ENV PATH=${JAVA_HOME}/bin:${PATH}
 RUN echo; echo "JAVA_HOME=${JAVA_HOME}"; echo
diff --git a/docker-images/Dockerfile-mn b/docker-images/Dockerfile-mn
index 3b912820a..ade0ed124 100644
--- a/docker-images/Dockerfile-mn
+++ b/docker-images/Dockerfile-mn
@@ -9,10 +9,11 @@ RUN echo; echo "--- Installing wget, curl, vim, unzip in the slim image"; echo
 RUN apt-get update  && \
     apt-get install -yq --no-install-recommends unzip git
 
+ARG GRAALVM_HOME
+
 # Install and setup GraalVM
-COPY --from=graalvm-jdk-image /opt/graalvm-* /graalvm
+COPY --from=graalvm-jdk-image /opt/graalvm-* ${GRAALVM_HOME}
 
-ARG GRAALVM_HOME
 ENV JAVA_HOME=${GRAALVM_HOME}
 ENV PATH=${GRAALVM_HOME}/bin:${PATH}
 RUN echo; echo "JAVA_HOME=${JAVA_HOME}"; echo
diff --git a/docker-images/buildDockerImage.sh b/docker-images/buildDockerImage.sh
index 8fe9642a7..5b7e9940f 100755
--- a/docker-images/buildDockerImage.sh
+++ b/docker-images/buildDockerImage.sh
@@ -22,7 +22,7 @@ DOCKER_IMAGE_TAGS_WEBSITE="https://github.com/graalvm/container/pkgs/container/g
 
 FULL_GRAALVM_VERSION="${1:-"${DEFAULT_GRAALVM_VERSION}"}"
 FULL_DOCKER_TAG_NAME="graalvm-demos"
-GRAALVM_HOME_FOLDER="/graalvm"
+GRAALVM_HOME_FOLDER="/opt/graalvm"
 
 MAVEN_VERSION="3.8.3"
 GRADLE_VERSION="7.2"
diff --git a/runDockerImage.sh b/runDockerImage.sh
index 160812296..cb92527fd 100755
--- a/runDockerImage.sh
+++ b/runDockerImage.sh
@@ -13,7 +13,7 @@ DOCKER_IMAGE_TAGS_WEBSITE="https://github.com/graalvm/container/pkgs/container/g
 
 FULL_GRAALVM_VERSION="${1:-"${DEFAULT_GRAALVM_VERSION}"}"
 FULL_DOCKER_TAG_NAME="graalvm-demos"
-GRAALVM_HOME_FOLDER="/graalvm"
+GRAALVM_HOME_FOLDER="/opt/graalvm"
 WORKDIR="/graalvm-demos"
 SHARED_FOLDER="${PWD}/shared"
 DEMO_TYPE="${DEMO_TYPE:-console}"