From 8ea8571c232302e354c54b087c949751bfe95ad7 Mon Sep 17 00:00:00 2001
From: Chuck Lantz <clantz@microsoft.com>
Date: Fri, 21 Jun 2019 02:20:07 +0000
Subject: [PATCH] Demonstrate use of settings property

---
 .devcontainer/Dockerfile        | 36 +++++++++++++++++----------------
 .devcontainer/devcontainer.json |  3 ++-
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 5959e0e..6b4dbc8 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -5,25 +5,27 @@
 
 FROM rust:1
 
-RUN rustup update 2>&1
-RUN rustup component add rls rust-analysis rust-src 2>&1
-
-# Configure apt
+# Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
+
+# Configure apt and install packages
 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
-
-# Install other dependencies
-RUN apt-get install -y lldb-3.9
-
-# Clean up
-RUN apt-get autoremove -y \
+    && apt-get -y install --no-install-recommends apt-utils 2>&1 \
+    #
+    # Verify git, needed tools installed
+    && apt-get -y install git procps lsb-release \
+    #
+    # Install other dependencies
+    && apt-get install -y lldb-3.9 \
+    #
+    # Install Rust components
+    && rustup update \
+    && rustup component add rls rust-analysis rust-src \
+    #
+    # Clean up
+    && apt-get autoremove -y \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/*
-ENV DEBIAN_FRONTEND=dialog
 
-# Set the default shell to bash rather than sh
-ENV SHELL /bin/bash
\ No newline at end of file
+# Switch back to dialog for any ad-hoc use of apt-get
+ENV DEBIAN_FRONTEND=dialog
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index ec6b42e..fdc8d8f 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -12,6 +12,7 @@
 		"seccomp=unconfined"
 	],
 	"settings": {
-		"lldb.executable": "/usr/bin/lldb-3.9"
+		"lldb.executable": "/usr/bin/lldb-3.9",
+		"terminal.integrated.shell.linux": "/bin/bash"
 	}
 }
\ No newline at end of file