Clantz/image generation (#7)

.vscode/launch.json

@@ -33,7 +33,18 @@
 				"--stubRegistry", "clantz.azurecr.io",
 				"--stubRegistryPath", "vscode-dev-containers"
 			]
+        }, {
+            "type": "node",
+            "request": "launch",
+            "name": "Run CG Manifest Script",
+			"program": "${workspaceFolder}/build/vscdc",
+			"args": [
+				"cg",
+				"--release", "clantz/image-generation",
+				"--github-repo", "chuxel/vscode-dev-containers",
+				"--registry", "clantz.azurecr.io",
+				"--registryPath", "vscode-dev-containers"
+			]
         }
-
     ]
 }

build/.eslintrc.js

@@ -13,5 +13,6 @@ module.exports = {
         "ecmaVersion": 2018
     },
     "rules": {
+        "require-atomic-updates": 0
     }
 };

build/assets/alpine.Dockerfile

@@ -14,15 +14,17 @@ ARG USER_GID=$USER_UID
 
 # [Optional] Update UID/GID if needed
 RUN if [ "$USER_GID" != "1000" ] || [ "$USER_UID" != "1000" ]; then \
-        sudo apk add --no-cache shadow \
-        && sudo groupmod 1000 --gid $USER_GID; fi \
-        && sudo usermod --uid $USER_UID --gid $USER_GID 1000; fi; \
+        apk add --no-cache shadow \
+        && sudo groupmod 1000 --gid $USER_GID \
+        && sudo usermod --uid $USER_UID --gid $USER_GID 1000; \
     fi
 
-# ***************************************************************
-# * Add steps for installing any other needed dependencies here *
-# ***************************************************************
-# RUN sudo apk add add --no-cache <your-package-name-here>
+# ****************************************************************
+# * Add steps for installing any other needed dependencies here. *
+# * Omit sudo if it isn't installed and you are running as root. *
+# ****************************************************************
+# RUN sudo apk update \
+#     && sudo apk add --no-cache <your-package-name-here>
 
 # Uncomment to default to non-root user
 # USER $USER_UID

build/assets/debian.Dockerfile

@@ -15,22 +15,23 @@ ARG USER_GID=$USER_UID
 # [Optional] Update UID/GID if needed and install additional software
 RUN if [ "$USER_GID" != "1000" ] || [ "$USER_UID" != "1000" ]; then \
         sudo groupmod 1000 --gid $USER_GID \
-        && sudo usermod --uid $USER_UID --gid $USER_GID 1000 \
+        && sudo usermod --uid $USER_UID --gid $USER_GID 1000; \
     fi
 
 # ENV DEBIAN_FRONTEND=noninteractive
 # RUN apt-get update \
 #    #
-#    ***************************************************************
-#    * Add steps for installing any other needed dependencies here *
-#    ***************************************************************
+#    # ****************************************************************
+#    # * Add steps for installing any other needed dependencies here. *
+#    # * Omit sudo if it isn't installed and you are running as root. *
+#    # ****************************************************************
 #    && sudo apt-get -y install --no-reccomends <your-package-name-here>
 #    #
 #    # Clean up
 #    && sudo apt-get autoremove -y \
 #    && sudo apt-get clean -y \
 #    && sudo rm -rf /var/lib/apt/lists/*
-# ENV DEBIAN_FRONTEND=
+# ENV DEBIAN_FRONTEND=dialog
 
 # Uncomment to default to non-root user
 # USER $USER_UID

build/assets/redhat.Dockerfile

@@ -15,12 +15,13 @@ ARG USER_GID=$USER_UID
 # [Optional] Update UID/GID if needed and install additional software
 RUN if [ "$USER_GID" != "1000" ] || [ "$USER_UID" != "1000" ]; then \
         sudo groupmod 1000 --gid $USER_GID \
-        && sudo usermod --uid $USER_UID --gid $USER_GID 1000 \
+        && sudo usermod --uid $USER_UID --gid $USER_GID 1000; \
     fi
 
-# ***************************************************************
-# * Add steps for installing any other needed dependencies here *
-# ***************************************************************
+# ****************************************************************
+# * Add steps for installing any other needed dependencies here. *
+# * Omit sudo if it isn't installed and you are running as root. *
+# ****************************************************************
 # RUN sudo yum -y install <your-package-name-here> \
 #     # 
 #     # Clean up

build/config.json

@@ -3,38 +3,72 @@
 	"containerRegistryPath": "public/vscode/devcontainers",
 	"stubRegistry": "mcr.microsoft.com",
 	"stubRegistryPath": "vscode/devcontainers",
-	"definitionBuildGraph": {
-		"ubuntu-18.04-git": true,
-		"alpine-3.10-git": true,
-		"debian-9-git": true,
-		"javascript-node-10": {
-			"typescript-node-10": true
+
+	"definitionBuildSettings": {
+		"debian-9-git": {
+			"latest": true,
+			"rootDistro": "debian",
+			"tags": [
+				"base:${VERSION}-debian-9",
+				"base:${VERSION}-stretch"
+			]
+		},
+		"ubuntu-18.04-git": {
+			"rootDistro": "debian",
+			"tags": [
+				"base:${VERSION}-ubuntu-18.04",
+				"base:${VERSION}-bionic"
+			]
+		},
+		"alpine-3.10-git": {
+			"rootDistro": "alpine",
+			"tags": [
+				 "base:${VERSION}-alpine-3.10"
+			]
 		},
 		"javascript-node-12": {
-			"typescript-node-12": true
+			"latest": true,
+			"rootDistro": "debian",
+			"tags": [
+				"javascript-node:${VERSION}-12"
+			]
+		},
+		"javascript-node-10": {
+			"latest": true,
+			"rootDistro": "debian",
+			"tags": [
+				"javascript-node:${VERSION}-10"
+			]
+		},
+		"typescript-node-12": {
+			"latest": true,
+			"rootDistro": "debian",
+			"parent": "javascript-node-12",
+			"tags": [
+				"typescript-node:${VERSION}-12"
+			]
+		},
+		"typescript-node-10": {
+			"rootDistro": "debian",
+			"parent": "javascript-node-10",
+			"tags": [
+				"typescript-node:${VERSION}-10"
+			]
 		}
 	},
-	"alpineDefinitions": [
-	    "alpine-3.10-git"
-	],
-	"redhatDefinitions": [
-	    "java-12"
-	],
+
 	"filesToStage": [
 		"+(containers|repository-containers)/**/!(test-project)/*",
 		"LICENSE",
 		"package.json",
 		"yarn.lock",
 		".npmignore"
 	],
+
 	"githubRepoName": "microsoft/vscode-dev-containers",
 	"containersPathInRepo": "containers",
 	"scriptLibraryPathInRepo": "script-library",
-	"commonScriptNames": {
-		"debian": "common-debian.sh",
-		"alpine": "common-alpine.sh",
-		"redhat": "common-redhat.sh"
-	},
+
 	"devContainerJsonPreamble": "For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:",
 	"dockerFilePreamble": "For information on the contents of the container image below, see following Dockerfile:"
 }