From fedd5814f3b5acedd6d06c617fa5528de4058775 Mon Sep 17 00:00:00 2001 From: Damien Arnodo Date: Sun, 7 Dec 2025 18:02:14 +0000 Subject: [PATCH] fix: use $HOME/build instead of /workspace, remove apk install (git already in image) --- .gitea/workflows/build-images.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/build-images.yml b/.gitea/workflows/build-images.yml index f38342c..27bb2d5 100644 --- a/.gitea/workflows/build-images.yml +++ b/.gitea/workflows/build-images.yml @@ -73,24 +73,24 @@ jobs: matrix: image: ${{ fromJson(needs.detect-changes.outputs.matrix) }} steps: - - name: Install git - run: | - # buildkit image is based on Alpine - cat /etc/os-release || true - apk add --no-cache git || apt-get update && apt-get install -y git || true - - name: Checkout repository run: | - git clone --depth 1 https://gitea.arnodo.fr/${{ gitea.repository }}.git /workspace - cd /workspace - git checkout ${{ gitea.sha }} || true + # Use $HOME to avoid /workspace conflicts + WORK_DIR="$HOME/build" + rm -rf "$WORK_DIR" + mkdir -p "$WORK_DIR" + + # Git is included in moby/buildkit image + git clone --depth 1 https://gitea.arnodo.fr/${{ gitea.repository }}.git "$WORK_DIR" + + echo "WORK_DIR=$WORK_DIR" >> $GITHUB_ENV - name: Build and push with Buildkit env: REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }} REGISTRY_USER: ${{ gitea.actor }} run: | - cd /workspace + cd "$WORK_DIR" IMAGE_NAME="${{ env.REGISTRY }}/damien/${{ matrix.image }}" SHORT_SHA=$(echo "${{ gitea.sha }}" | cut -c1-7) @@ -108,6 +108,8 @@ jobs: EOF echo "Building ${IMAGE_NAME}..." + echo "Context: ./images/${{ matrix.image }}" + ls -la ./images/${{ matrix.image }}/ # Build and push with buildctl buildctl-daemonless.sh build \