Cleaned up template examples and added nix-dood dev container

.github/actions/smoke-test/build.sh

@@ -13,7 +13,7 @@ pushd "${SRC_DIR}"
 # Configure templates only if `devcontainer-template.json` contains the `options` property.
 OPTION_PROPERTY=( $(jq -r '.options' devcontainer-template.json) )
 
-if [ "${OPTION_PROPERTY}" != "" ] && [ "${OPTION_PROPERTY}" != "null" ] ; then  
+if [ "${OPTION_PROPERTY}" != "" ] && [ "${OPTION_PROPERTY}" != "null" ] ; then
     OPTIONS=( $(jq -r '.options | keys[]' devcontainer-template.json) )
 
     if [ "${OPTIONS[0]}" != "" ] && [ "${OPTIONS[0]}" != "null" ] ; then

.github/pull_request_template.md

@@ -0,0 +1,7 @@
+## Describe your changes
+
+Briefly describe the feature being introduced.
+
+## Checklist before requesting a review
+- [ ] I have performed a self-review of my code
+- [ ] If it is a core feature, I have added thorough tests.

.github/workflows/test-pr.yaml

@@ -12,8 +12,7 @@ jobs:
         id: filter
         with:
           filters: |
-            color: ./**/color/**
-            hello: ./**/hello/**
+            nix-dood: ./**/nix-dood/**
 
   test:
     needs: [detect-changes]

Makefile

@@ -0,0 +1,7 @@
+CONTAINERID ?= $(shell bash -c 'read -p "Dev Container ID: " dci; echo $$dci')
+
+build:
+	./.github/actions/smoke-test/build.sh $(CONTAINERID)
+
+run-tests:
+	./.github/actions/smoke-test/test.sh $(CONTAINERID)

src/nix-dood/.devcontainer/Dockerfile

@@ -0,0 +1,6 @@
+FROM ghcr.io/xtruder/nix-devcontainer:v1
+
+RUN echo "${templateOption:greeting}" > ~/greeting.txt
+
+# cache /nix
+VOLUME /nix

src/nix-dood/.devcontainer/devcontainer.json

@@ -0,0 +1,23 @@
+{
+  "name": "feenx-nix-dood",
+  "build": {
+   "dockerfile": "Dockerfile",
+   "context": ".."
+  },
+
+  "userEnvProbe": "loginShell",
+  "postCreateCommand": "cat ~/greeting.txt",
+
+  "customizations": {
+   "vscode": {
+      "extensions": [
+         "ms-azuretools.vscode-docker",
+         "arrterian.nix-env-selector"
+      ]
+   }
+  },
+
+  "features": {
+   "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
+  }
+}

src/nix-dood/devcontainer-template.json

@@ -0,0 +1,23 @@
+{
+    "id": "nix-dood",
+    "version": "1.0.0",
+    "name": "Nix with Docker outside of Docker",
+    "description": "A Template to use nix flakes and the devcontainer's docker host access.",
+    "documentationURL": "https://github.com/feenx-lab/feenx-devcontainers/tree/main/src/nix-dood",
+    "licenseURL": "https://github.com/feenx-lab/feenx-devcontainers/blob/main/LICENSE",
+    "options": {
+        "greeting": {
+            "type": "string",
+            "description": "Select a pre-made greeting, or enter your own",
+            "proposals": [
+                "Welcome to your declarative, Nix-powered, dev environment setup.",
+                "Dev environment ready.",
+                "Autobots assemble!"
+            ],
+            "default": "Welcome to your declarative, Nix-powered, dev environment setup."
+        }
+    },
+    "platforms": [
+        "Any"
+    ]
+}

test/color/test.sh → test/nix-dood/test.sh

@@ -4,7 +4,7 @@ source test-utils.sh
 
 # Template specific tests
 check "distro" lsb_release -c
-check "color" [ $(cat /tmp/color.txt | grep red) ]
+check "greeting" [ $(cat /home/code/greeting.txt | grep dev) ]
 
 # Report result
 reportResults

test/test-utils/test-utils.sh

@@ -11,7 +11,7 @@ check() {
     LABEL=$1
     shift
     echo -e "\n🧪 Testing $LABEL"
-    if "$@"; then 
+    if [ -n "$*" ]; then
         echo "✅  Passed!"
         return 0
     else
@@ -25,7 +25,7 @@ reportResults() {
     if [ ${#FAILED[@]} -ne 0 ]; then
         echoStderr -e "\n💥  Failed tests: ${FAILED[@]}"
         exit 1
-    else 
+    else
         echo -e "\n💯  All passed!"
         exit 0
     fi