From 10a3c4353f2d2de9105a8d2d94676a086d74fb6f Mon Sep 17 00:00:00 2001
From: Graham McIntire <graham@mcintire.me>
Date: Tue, 13 Jan 2026 15:44:19 -0600
Subject: [PATCH] Fix buildx setup for GitLab DinD environment

---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e56458..b0bc332 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,9 +62,9 @@ build:main:
   services:
     - docker:24-dind
   before_script:
-    - docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_TOKEN
+    - echo "$DOCKERHUB_TOKEN" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
     # Enable buildx for multi-arch
-    - docker buildx create --use --name multiarch-builder
+    - docker buildx create --driver docker-container --name multiarch-builder --use
     - docker buildx inspect --bootstrap
   script:
     - |
@@ -88,9 +88,9 @@ release:multiarch:
   services:
     - docker:24-dind
   before_script:
-    - docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_TOKEN
+    - echo "$DOCKERHUB_TOKEN" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
     # Enable buildx for multi-arch
-    - docker buildx create --use --name multiarch-builder
+    - docker buildx create --driver docker-container --name multiarch-builder --use
     - docker buildx inspect --bootstrap
   script:
     - |