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

---
 .devcontainer/Dockerfile        | 37 ++++++++++++++++++---------------
 .devcontainer/devcontainer.json |  5 ++++-
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index ea8055f..bafa6c3 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,29 +1,32 @@
-#-----------------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See LICENSE in the project root for license information.
-#-----------------------------------------------------------------------------------------
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
 
 FROM php:7-cli
 
-# Configure apt
+# Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update \
-    && apt-get -y install --no-install-recommends apt-utils 2>&1
 
-# Install xdebug
-RUN yes | pecl install xdebug \
+# Configure apt and install packages
+RUN apt-get update \
+    && apt-get -y install --no-install-recommends apt-utils 2>&1 \
+    #
+    # Install git, procps, lsb-release (useful for CLI installs)
+    && apt-get -y install git procps lsb-release \
+	#
+	# Install xdebug
+	&& yes | pecl install xdebug \
 	&& echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \
 	&& echo "xdebug.remote_enable=on" >> /usr/local/etc/php/conf.d/xdebug.ini \
-	&& echo "xdebug.remote_autostart=on" >> /usr/local/etc/php/conf.d/xdebug.ini
-
-# 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 \
+	&& echo "xdebug.remote_autostart=on" >> /usr/local/etc/php/conf.d/xdebug.ini \
+    #
+    # Clean up
+    && apt-get autoremove -y \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/*
+
+# Switch back to dialog for any ad-hoc use of apt-get
 ENV DEBIAN_FRONTEND=dialog
 
-# Set the default shell to bash rather than sh
-ENV SHELL /bin/bash
\ No newline at end of file
+
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 4539cf9..6e44ac4 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,5 +5,8 @@
 	"extensions": [
         "felixfbecker.php-debug",
 		"felixfbecker.php-intellisense"
-	]
+	],
+	"settings": {
+		"terminal.integrated.shell.linux": "/bin/bash"
+	}
 }
\ No newline at end of file