Adapt to JAVA_HOME changing in base image

microsoft · May 28, 2019 · 15589cb · 15589cb
1 parent 0d06710
commit 15589cb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/containers/java-11/.devcontainer/Dockerfile b/containers/java-11/.devcontainer/Dockerfile
@@ -30,5 +30,8 @@ RUN apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/*
 ENV DEBIAN_FRONTEND=dialog
 
+# Allow for a consistant java home location for settings - image is changing over time
+RUN if [ ! -d "/docker-java-home" ]; then ln -s "${JAVA_HOME}" /docker-java-home; fi
+
 # Set the default shell to bash instead of sh
 ENV SHELL /bin/bash
diff --git a/containers/java-8-tomcat-8.5/.devcontainer/Dockerfile b/containers/java-8-tomcat-8.5/.devcontainer/Dockerfile
@@ -38,5 +38,8 @@ RUN apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/*
 ENV DEBIAN_FRONTEND=dialog
 
+# Allow for a consistant java home location for settings - image is changing over time
+RUN if [ ! -d "/docker-java-home" ]; then ln -s "${JAVA_HOME}" /docker-java-home; fi
+
 # Set the default shell to bash instead of sh
 ENV SHELL /bin/bash
diff --git a/containers/java-8/.devcontainer/Dockerfile b/containers/java-8/.devcontainer/Dockerfile
@@ -30,5 +30,8 @@ RUN apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/*
 ENV DEBIAN_FRONTEND=dialog
 
+# Allow for a consistant java home location for settings - image is changing over time
+RUN if [ ! -d "/docker-java-home" ]; then ln -s "${JAVA_HOME}" /docker-java-home; fi
+
 # Set the default shell to bash instead of sh
 ENV SHELL /bin/bash