Replace scripts with common tools and git features (#18)

* Build devcontainer from features

* Fix lldb.library setting

* Remove Node.js comments

* Remove swift 4.2

* Update README

* Remove table from README

* Add test script

* comment

Author: adam-fowler

README.md

@@ -4,33 +4,13 @@
 
 Develop Swift based applications. Includes everything you need to get up and running.
 
-| Metadata | Value |  
-|----------|-------|
-| *Contributors* | [0xTim](https://github.com/0xTim), [adam-fowler](https://github.com/adam-fowler), [cloudnull](https://github.com/cloudnull) |
-| *Categories* | Languages |
-| *Definition type* | Dockerfile |
-| *Supported architecture(s)* | x86-64, arm64 |
-| *Works in Codespaces* | Yes |
-| *Container host OS support* | Linux, macOS, Windows |
-| *Container OS* | Debian |
-| *Languages, platforms* | Swift |
-
-## Using this definition
-
-While the definition itself works unmodified, you can select the version of Swift the container uses by updating the `VARIANT` arg in the included `devcontainer.json` (and rebuilding if you've already created the container).
-
-```json
-"args": { "VARIANT": "5.7" }
-```
-
-Given how frequently web applications use Node.js for front end code, this container also includes an optional install of Node.js. You can enable installation and change the version of Node.js installed or disable its installation by updating the `args` property in `.devcontainer/devcontainer.json`.
-
-```jsonc
-"args": {
-    "VARIANT": "5.7",
-    "NODE_VERSION": "14" // Set to "none" to skip Node.js installation
-}
-```
+## Options
+
+| Options Id | Description | Type | Default Value |
+|-----|-----|-----|-----|
+| imageVariant | Version of Swift | string | 5.7 |
+
+This template uses the common-utils feature to implement some commonly implemented options including install zsh and updating packages. Edit the values in the `devcontainer.json` to enable these. More details on available options can be found [here](https://github.com/devcontainers/features/blob/main/src/common-utils/README.md). 
 
 ### Adding the definition to a project or codespace
 

scripts/publish.sh

@@ -1,3 +1,4 @@
+#!/bin/sh
 # This script requires the devcontainer tool for publishing. You can install it with
 #   npm install -g @devcontainers/cli
 # More details can be found here https://github.com/devcontainers/cli#try-it-out

scripts/test.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+# This script requires the devcontainer tool for publishing. You can install it with
+#   npm install -g @devcontainers/cli
+# More details can be found here https://github.com/devcontainers/cli#try-it-out
+#
+# The script currently requires you to edit the devcontainer.json to replace the ${templateOption:imageVariant}
+# with the swift version number you are testing with
+template_id=swift
+set -e
+
+# Build container
+echo "Building dev container"
+id_label="test-container=${template_id}"
+devcontainer up --id-label ${id_label} --workspace-folder "src/${template_id}/"
+
+# Test swift runs
+devcontainer exec --workspace-folder "src/${template_id}/" --id-label ${id_label} /bin/sh -c 'swift --version'
+
+# Clean up
+docker rm -f $(docker container ls -f "label=${id_label}" -q)

src/swift/.devcontainer/Dockerfile

@@ -1,36 +1,44 @@
 {
 	"name": "Swift",
-	"build": {
-		"dockerfile": "Dockerfile"
-	},
-	"runArgs": [
-		"--cap-add=SYS_PTRACE",
-		"--security-opt",
-		"seccomp=unconfined"
-	],
+    "image": "swift:${templateOption:imageVariant}",
+    "features": {
+        "ghcr.io/devcontainers/features/common-utils:2": {
+            "installZsh": "false",
+            "username": "vscode",
+            "userUid": "1000",
+            "userGid": "1000",
+            "upgradePackages": "false"
+        },
+        "ghcr.io/devcontainers/features/git:1": {
+            "version": "os-provided",
+            "ppa": "false"
+        }
+    },
+    "runArgs": [
+        "--cap-add=SYS_PTRACE",
+        "--security-opt",
+        "seccomp=unconfined"
+    ],
+    // Configure tool-specific properties.
+    "customizations": {
+        // Configure properties specific to VS Code.
+        "vscode": {
+            // Set *default* container specific settings.json values on container create.
+            "settings": {
+                "lldb.library": "/usr/lib/liblldb.so"
+            },
+            // Add the IDs of extensions you want installed when the container is created.
+            "extensions": [
+                "sswg.swift-lang"
+            ]
+        }
+    },
+    // Use 'forwardPorts' to make a list of ports inside the container available locally.
+    // "forwardPorts": [],
 
-	// Configure tool-specific properties.
-	"customizations": {
-		// Configure properties specific to VS Code.
-		"vscode": {
-			// Set *default* container specific settings.json values on container create.
-			"settings": { 
-				"lldb.library": "/usr/lib/liblldb.so"
-			},
-			
-			// Add the IDs of extensions you want installed when the container is created.
-			"extensions": [
-				"sswg.swift-lang"
-			]
-		}
-	},
+    // Use 'postCreateCommand' to run commands after the container is created.
+    "postCreateCommand": "swift --version",
 
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "",
-
-	// Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-	"remoteUser": "vscode"
+    // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+    "remoteUser": "vscode"
 }