From ee8c2a15935d0e03748da9585abf018c8a2322a4 Mon Sep 17 00:00:00 2001
From: Chuck Lantz <clantz@microsoft.com>
Date: Thu, 20 Jun 2019 23:23:55 +0000
Subject: [PATCH] Consolidate build layers

---
 .devcontainer/Dockerfile        | 24 +++++++++++-------------
 .devcontainer/devcontainer.json |  3 ++-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index ce4384d..7118f9f 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -8,19 +8,17 @@ FROM maven:3.6-jdk-8
 # Configure apt
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
-    && apt-get -y install --no-install-recommends apt-utils 2>&1
-
-# Install git, process tools, lsb-release (common in install instructions for CLIs)
-RUN apt-get -y install git procps lsb-release
-
-# Clean up
-RUN apt-get autoremove -y \
+    && apt-get -y install --no-install-recommends apt-utils 2>&1 \
+    #
+    # Install git, process tools, lsb-release (common in install instructions for CLIs)
+    && apt-get -y install git procps lsb-release \
+    #
+    # Allow for a consistant java home location for settings - image is changing over time
+    && if [ ! -d "/docker-java-home" ]; then ln -s "${JAVA_HOME}" /docker-java-home; fi \
+    #
+    # Clean up
+    && apt-get autoremove -y \
     && apt-get clean -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 16bdb85..b3dc0ab 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,6 +6,7 @@
 		"redhat.vscode-xml"
 	],
 	"settings":{
-		"java.home": "/docker-java-home"
+		"java.home": "/docker-java-home",
+		"terminal.integrated.shell.linux": "/bin/bash"
 	}
 }