feat: more improvements to devcontainer and arm64 (#1242)

Signed-off-by: Devin Buhl <devin@buhl.casa>

.devcontainer/ci/Dockerfile

@@ -0,0 +1,2 @@
+#Ref: https://github.com/devcontainers/ci/issues/191
+FROM mcr.microsoft.com/devcontainers/base:alpine

.devcontainer/ci/devcontainer.json

@@ -1,6 +1,10 @@
 {
+  "$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.schema.json",
   "name": "Flux Cluster Template (CI)",
-  "image": "mcr.microsoft.com/devcontainers/base:alpine",
+  "build": {
+    "dockerfile": "./Dockerfile",
+    "context": "."
+  },
   "features": {
     "./features": {}
   },

.devcontainer/ci/features/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
-  "name": "Flux Cluster Template (Dev Tooling)",
+  "name": "Flux Cluster Template (Tools)",
   "id": "flux-cluster-template",
   "version": "1.0.0",
-  "description": "Install Development Tools"
+  "description": "Install Tools"
 }

.devcontainer/ci/features/install.sh

@@ -1,9 +1,11 @@
 #!/bin/sh
+set -e
+set -o noglob
 
 ARCH="$(uname -m)"
-if [ "$ARCH" == "x86_64" ]; then
+if [ "$ARCH" = "x86_64" ]; then
     ARCH="amd64"
-elif [ "$ARCH" == "aarch64" ]; then
+elif [ "$ARCH" = "aarch64" ]; then
     ARCH="arm64"
 fi
 
@@ -13,29 +15,30 @@ fi
 
 apk add --no-cache \
     bash bind-tools ca-certificates curl python3 \
-    py3-pip moreutils jq git \
-    openssh-client
+        py3-pip moreutils jq git iputils \
+            openssh-client
 
 apk add --no-cache \
     --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community \
-    age direnv fish github-cli \
-    go-task helm k0sctl kubectl \
-    kustomize sops yq
-
-apk add --no-cache \
-    --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    cilium-cli flux stern
-
-# Naming things is hard
-ln -s /usr/bin/go-task /usr/local/bin/task
+        age direnv fish helm kubectl kustomize sops yq
 
 #
 # Install Tools not in Alpine Repositories
 #
 
-curl https://i.jpillora.com/cloudflare/cloudflared! | sudo bash
-curl https://i.jpillora.com/budimanjojo/talhelper! | sudo bash
-curl https://i.jpillora.com/yannh/kubeconform! | sudo bash
+for installer_path in \
+    "budimanjojo/talhelper!" \
+    "cilium/cilium-cli!!?as=cilium" \
+    "cli/cli!!?as=gh" \
+    "cloudflare/cloudflared!" \
+    "fluxcd/flux2!!?as=flux" \
+    "go-task/task!" \
+    "k0sproject/k0sctl!" \
+    "stern/stern!" \
+    "yannh/kubeconform!"
+do
+    curl -fsSL "https://i.jpillora.com/${installer_path}" | bash
+done
 
 curl -fsSL -o /usr/local/bin/talosctl \
     "https://github.com/siderolabs/talos/releases/latest/download/talosctl-linux-${ARCH}"