Update features from sources

Author: geekstuff-dev

README.md

@@ -15,7 +15,7 @@ Contributions, issues and such are welcomed **in their own open source projects*
 | [Azure CLI](./src/azure-cli/README.md) | [v0.2.1](https://gitlab.com/geekstuff.dev/devcontainers/features/azure-cli/-/tree/v0.2.1) | [ghcr.io/geekstuff-dev/devcontainers-features/azure-cli](https://github.com/users/geekstuff-dev/packages/container/package/devcontainers-features%2Fazure-cli) |
 | [Basics](./src/basics/README.md) | [v1.1.3](https://gitlab.com/geekstuff.dev/devcontainers/features/basics/-/tree/v1.1.3) | [ghcr.io/geekstuff-dev/devcontainers-features/basics](https://github.com/users/geekstuff-dev/packages/container/package/devcontainers-features%2Fbasics) |
 | [Direnv](./src/direnv/README.md) | [v0.2.2](https://gitlab.com/geekstuff.dev/devcontainers/features/direnv/-/tree/v0.2.2) | [ghcr.io/geekstuff-dev/devcontainers-features/direnv](https://github.com/users/geekstuff-dev/packages/container/package/devcontainers-features%2Fdirenv) |
-| [Docker](./src/docker/README.md) | [v0.1.9](https://gitlab.com/geekstuff.dev/devcontainers/features/docker/-/tree/v0.1.9) | [ghcr.io/geekstuff-dev/devcontainers-features/docker](https://github.com/users/geekstuff-dev/packages/container/package/devcontainers-features%2Fdocker) |
+| [Docker](./src/docker/README.md) | [v0.1.10](https://gitlab.com/geekstuff.dev/devcontainers/features/docker/-/tree/v0.1.10) | [ghcr.io/geekstuff-dev/devcontainers-features/docker](https://github.com/users/geekstuff-dev/packages/container/package/devcontainers-features%2Fdocker) |
 | [Flux CD](./src/fluxcd/README.md) | [v0.0.6](https://gitlab.com/geekstuff.dev/devcontainers/features/fluxcd/-/tree/v0.0.6) | [ghcr.io/geekstuff-dev/devcontainers-features/fluxcd](https://github.com/users/geekstuff-dev/packages/container/package/devcontainers-features%2Ffluxcd) |
 | [GCloud CLI](./src/gcloud-cli/README.md) | [v0.2.1](https://gitlab.com/geekstuff.dev/devcontainers/features/gcloud-cli/-/tree/v0.2.1) | [ghcr.io/geekstuff-dev/devcontainers-features/gcloud-cli](https://github.com/users/geekstuff-dev/packages/container/package/devcontainers-features%2Fgcloud-cli) |
 | [Gas](./src/gas/README.md) | [v0.0.1](https://gitlab.com/geekstuff.dev/devcontainers/features/gas/-/tree/v0.0.1) | [ghcr.io/geekstuff-dev/devcontainers-features/gas](https://github.com/users/geekstuff-dev/packages/container/package/devcontainers-features%2Fgas) |

src/docker/devcontainer-feature.json

@@ -1,10 +1,10 @@
 {
     "name": "Docker",
     "id": "docker",
-    "version": "0.1.9",
+    "version": "0.1.10",
     "description": "Installs Docker clients and mounts Docker sock",
-    "documentationURL": "https://gitlab.com/geekstuff.dev/devcontainers/features/docker/-/blob/v0.1.9/README.md",
-    "licenseURL": "https://gitlab.com/geekstuff.dev/devcontainers/features/docker/-/blob/v0.1.9/LICENSE",
+    "documentationURL": "https://gitlab.com/geekstuff.dev/devcontainers/features/docker/-/blob/v0.1.10/README.md",
+    "licenseURL": "https://gitlab.com/geekstuff.dev/devcontainers/features/docker/-/blob/v0.1.10/LICENSE",
     "installsAfter": ["ghcr.io/geekstuff-dev/devcontainers-features/basics"],
     "mounts": [{
         "source": "/var/run/docker.sock",

src/docker/install.sh

@@ -92,5 +92,7 @@ test -e /home/$DEV_USERNAME/.docker/config.json \
     || echo "{}" > /home/$DEV_USERNAME/.docker/config.json
 chown -R $DEV_USERNAME: /home/$DEV_USERNAME/.docker
 
+# copy buildx helper script
+install setup-buildx.sh /usr/bin/
 
 out "[] docker is installed"

src/docker/setup-buildx.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+set -e
+
+
+if ! command -v docker 1>/dev/null 2>/dev/null; then
+  echo "error: docker is missing"
+  exit 1
+fi
+
+if ! docker buildx --help 1>/dev/null 2>/dev/null; then
+  echo "docker buildx not present (old docker?)"
+  exit 1
+fi
+
+TARGET_PLATFORMS=${TARGET_PLATFORMS:-linux/amd64,linux/arm64}
+BUILDX_CONTEXT=${BUILDX_CONTEXT:-ctx}
+export BUILDX_BUILDER=${BUILDX_BUILDER:-builder}
+
+# This var can be used by caller to replace or append other args
+BUILDX_BUILDER_CREATE_BOOTSTRAP_ARG=${BUILDX_BUILDER_CREATE_BOOTSTRAP_ARG:-"--bootstrap"}
+
+docker context inspect ${BUILDX_CONTEXT} >/dev/null 2>&1 \
+  || docker context create ${BUILDX_CONTEXT} 1>/dev/null
+
+docker buildx inspect ${BUILDX_BUILDER} >/dev/null 2>&1 \
+  || docker buildx create \
+    --name ${BUILDX_BUILDER} \
+    --driver docker-container \
+    ${BUILDX_BUILDER_CREATE_BOOTSTRAP_ARG} \
+    --platform ${TARGET_PLATFORMS} \
+    ${BUILDX_CONTEXT} 1>/dev/null
+
+#
+echo "[$(date -u '+%H:%M:%S')] Docker buildx builder [${BUILDX_BUILDER}] is ready with platforms [${TARGET_PLATFORMS}]"
+cat <<EOF
+> Example usage: docker buildx build --builder ${BUILDX_BUILDER} --platform linux/amd64,linux/arm64 -t \${CI_REGISTRY_IMAGE}/build:\${CI_COMMIT_SHA} .
+EOF