From 654fd5b27fbb720a1481ce90f9728c42ff51cbeb Mon Sep 17 00:00:00 2001
From: Chuck Lantz <clantz@microsoft.com>
Date: Fri, 26 Apr 2019 18:29:26 +0000
Subject: [PATCH] Add java path override in the event it is set in local user
 settings

---
 .devcontainer/Dockerfile           | 14 ++++++++++++--
 .devcontainer/settings.vscode.json |  3 +++
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 .devcontainer/settings.vscode.json

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 55a4486..b9b137a 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -5,11 +5,21 @@
 
 FROM maven:3.6-jdk-8
 
-# Install git, process tools
-RUN apt-get update && apt-get -y install git procps
+# Copy endpoint specific user settings overrides into container to specify Java path
+COPY settings.vscode.json /root/.vscode-remote/data/Machine/settings.json
+
+# Configure apt
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update \
+    && apt-get -y install --no-install-recommends apt-utils 2>&1
+
+# Verify git, needed tools installed
+RUN apt-get -y install git procps curl
 
 # Clean up
 RUN apt-get autoremove -y \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/*
+ENV DEBIAN_FRONTEND=dialog
+
 	
\ No newline at end of file
diff --git a/.devcontainer/settings.vscode.json b/.devcontainer/settings.vscode.json
new file mode 100644
index 0000000..e4faefa
--- /dev/null
+++ b/.devcontainer/settings.vscode.json
@@ -0,0 +1,3 @@
+{
+    "java.home": "/docker-java-home"
+}
\ No newline at end of file