From 9981df6a8527645eff4bc65275adba80ee64f800 Mon Sep 17 00:00:00 2001
From: Chuck Lantz <chuck_lantz@hotmail.com>
Date: Fri, 13 Aug 2021 16:12:30 +0000
Subject: [PATCH] Bump to 0.191.0

---
 .devcontainer/Dockerfile        | 25 +++++++++++++------------
 .devcontainer/devcontainer.json |  6 +++---
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index c38d0cc..0e5e369 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,23 +1,24 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.185.0/containers/java/.devcontainer/base.Dockerfile
-ARG VARIANT="14"
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.191.0/containers/java/.devcontainer/base.Dockerfile
+# [Choice] Java version: 8, 11, 16
+ARG VARIANT=11
 FROM mcr.microsoft.com/vscode/devcontainers/java:0-${VARIANT}
 
-# [Optional] Install Maven or Gradle
+# [Option] Install Maven
 ARG INSTALL_MAVEN="false"
-ARG MAVEN_VERSION=3.6.3
+ARG MAVEN_VERSION=""
+# [Option] Install Gradle
 ARG INSTALL_GRADLE="false"
-ARG GRADLE_VERSION=5.4.1
-RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "source /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi \
-    && if [ "${INSTALL_GRADLE}" = "true" ]; then su vscode -c "source /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle \"${GRADLE_VERSION}\""; fi
+ARG GRADLE_VERSION=""
+RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi \
+    && if [ "${INSTALL_GRADLE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle \"${GRADLE_VERSION}\""; fi
 
-# [Optional] Install a version of Node.js using nvm for front end dev
-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
+# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
+ARG NODE_VERSION="none"
+RUN if [ "${NODE_VERSION}" = "none" ]; 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 \
 #     && apt-get -y install --no-install-recommends <your-package-list-here>
 
 # [Optional] Uncomment this line to install global node packages.
-# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
+# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 8686937..83f8ba6 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,16 +1,16 @@
 // For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.185.0/containers/java
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.191.0/containers/java
 {
 	"name": "Java",
 	"build": {
 		"dockerfile": "Dockerfile",
 		"args": {
-			// Update the VARIANT arg to pick a Java version: 11, 14
+			// Update the VARIANT arg to pick a Java version: 8, 11, 14
 			"VARIANT": "11",
 			// Options
 			"INSTALL_MAVEN": "true",
+			"MAVEN_VERSION": "3.6.3",
 			"INSTALL_GRADLE": "false",
-			"INSTALL_NODE": "false",
 			"NODE_VERSION": "lts/*"
 		}
 	},