From 913acfbc3485f4b222d7861047cc0db111cf7f00 Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Tue, 28 May 2019 09:54:36 -0700 Subject: [PATCH] Handle JAVA_HOME varying between base image versions --- .devcontainer/Dockerfile | 3 +++ .devcontainer/devcontainer.json | 5 ++++- .devcontainer/settings.vscode.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 0af13c0..79cb19e 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -22,5 +22,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 rather than sh ENV SHELL /bin/bash diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 3abc31c..16bdb85 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,5 +4,8 @@ "extensions": [ "vscjava.vscode-java-pack", "redhat.vscode-xml" - ] + ], + "settings":{ + "java.home": "/docker-java-home" + } } diff --git a/.devcontainer/settings.vscode.json b/.devcontainer/settings.vscode.json index d2d374e..e4faefa 100644 --- a/.devcontainer/settings.vscode.json +++ b/.devcontainer/settings.vscode.json @@ -1,3 +1,3 @@ { - "java.home": "/usr/local/openjdk-8" + "java.home": "/docker-java-home" } \ No newline at end of file