From 34e28c194ab65f57fbc9ad4296710fc6207f82ae Mon Sep 17 00:00:00 2001
From: Chuck Lantz <clantz@microsoft.com>
Date: Thu, 18 Feb 2021 15:24:51 +0000
Subject: [PATCH] Refresh comments and README

---
 .devcontainer/Dockerfile        | 8 +++++---
 .devcontainer/devcontainer.json | 2 ++
 README.md                       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 35ab8f9c..2ac8de80 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,11 +1,13 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.134.0/containers/php/.devcontainer/base.Dockerfile
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.159.0/containers/php/.devcontainer/base.Dockerfile
+
+# [Choice] PHP version: 8, 8.0, 7, 7.4, 7.3
 ARG VARIANT="7"
 FROM mcr.microsoft.com/vscode/devcontainers/php:0-${VARIANT}
 
-# [Optional] Install a version of Node.js using nvm for front end dev
+# [Option] Install Node.js
 ARG INSTALL_NODE="true"
 ARG NODE_VERSION="lts/*"
-RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
+RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
 
 # [Optional] Uncomment this section to install additional OS packages.
 # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 4b34a705..f1c8c85f 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,3 +1,5 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.159.0/containers/php
 {
 	"name": "PHP",
 	"build": {
diff --git a/README.md b/README.md
index 4e636eeb..48b58d37 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Some things to try:
 1. **Edit:**
    - Open `index.php`
    - Try adding some code and check out the language features.
-   - Notice that PHP debugging and IntelliSense are already included in the container since the `.devcontainer/devcontainer.json` lists `"felixfbecker.php-debug"` and `"felixfbecker.php-intellisense"` as extensions to install automatically when the container is created.
+   - Notice that PHP debugging and IntelliSense are already included in the container since the `.devcontainer/devcontainer.json` lists `"felixfbecker.php-debug"`, `"bmewburn.vscode-intelephense-client"`, and `"mrmlnc.vscode-apache"` as extensions to install automatically when the container is created.
 1. **Terminal:** Press <kbd>ctrl</kbd>+<kbd>shift</kbd>+<kbd>\`</kbd> and type `uname` and other Linux commands from the terminal window.
 1. **Run and Debug:**
    - Open `index.php`