From 7ba788107f47ca2a7bcef893e448180b79b3771a Mon Sep 17 00:00:00 2001
From: goose <goose@block.dev>
Date: Thu, 12 Mar 2026 17:13:21 -0300
Subject: [PATCH] fix(ci): use external DinD with DOCKER_HOST env var

---
 .forgejo/workflows/lint-and-build.yml | 32 ++++++++++++++++-----------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/.forgejo/workflows/lint-and-build.yml b/.forgejo/workflows/lint-and-build.yml
index dead0cb..cbe9910 100644
--- a/.forgejo/workflows/lint-and-build.yml
+++ b/.forgejo/workflows/lint-and-build.yml
@@ -8,6 +8,9 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
+  # Configure Docker CLI to use the DinD service
+  DOCKER_HOST: tcp://docker-in-dinner:2375
+  DOCKER_TLS_CERTDIR: ""
 
 jobs:
   lint:
@@ -65,7 +68,7 @@ jobs:
         run: |
           apt-get update && apt-get install -y pkg-config libssl-dev
 
-      - name: Build project
+      - name: Build backend
         working-directory: ./backend
         run: cargo build --verbose
 
@@ -84,25 +87,28 @@ jobs:
   docker-build:
     runs-on: docker
     container:
-      image: docker:latest
+      image: docker:dind
     needs: build
     
     steps:
-      - name: Install Node.js
+      - name: Verify Docker connection
         run: |
-          apk add --no-cache nodejs npm
+          echo "Docker version:"
+          docker --version || true
+          echo "Docker info:"
+          docker info || true
+          echo "Docker ps:"
+          docker ps || true
 
       - uses: https://github.com/actions/checkout@v4
 
-      - name: Verify Docker connection
-        run: docker info
-
-      - name: Build backend Docker image
+      - name: Set up Docker Buildx
         run: |
-          cd backend
-          docker build -t normogen-backend:latest .
+          docker buildx version || true
+          docker buildx create --use || true
 
-      - name: Build frontend Docker image
+      - name: Build Docker image
+        working-directory: ./backend
         run: |
-          cd frontend
-          docker build -t normogen-frontend:latest .
+          docker build -t normogen-backend:test .
+          docker images | grep normogen-backend