From 66303c1078933091e8803afef913db27d4ddfcc9 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Thu, 31 Mar 2022 23:43:37 +0200
Subject: [PATCH] Use anonymous Docker volume as build output (#1825)

* Use anonymous Docker volume as build output

Use anonymous Docker volumes as build output. This makes sure
every build is using a clean output directory.
---
 .github/workflows/dev.yml | 1 +
 scripts/entry.sh          | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 25aac2d7a..3a0c4936c 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -102,6 +102,7 @@ jobs:
           docker run --rm --privileged -v "${GITHUB_WORKSPACE}:/build" \
             -e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
             -v "${{ matrix.board.runner }}-build-cache:/cache" \
+            -v "/build/output" \
             haos-builder make BUILDDIR=/build VERSION_DEV=${{ needs.prepare.outputs.version_dev }} ${{ matrix.board.defconfig }}
 
       - name: Upload images
diff --git a/scripts/entry.sh b/scripts/entry.sh
index 762c3b03f..c0b2dde45 100755
--- a/scripts/entry.sh
+++ b/scripts/entry.sh
@@ -13,6 +13,8 @@ if [ "${BUILDER_UID:-0}" -ne 0 ] && [ "${BUILDER_GID:-0}" -ne 0 ]; then
   echo "builder ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers
   # Make sure cache is accessible by builder
   chown "${BUILDER_UID}:${BUILDER_GID}" /cache
+  # Make sure output is accessible by builder (if anonymous volume is used)
+  chown "${BUILDER_UID}:${BUILDER_GID}" /build/output || true
   USER="builder"
 fi