From 9173f7dcc1a8fccc87a10dee004cafba677c5b72 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@datarhei.com>
Date: Wed, 13 Mar 2024 11:10:05 +0100
Subject: [PATCH 1/2] Add armv7 build for vod branch

---
 .github/workflows/build_base_vod.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_base_vod.yaml b/.github/workflows/build_base_vod.yaml
index 66236eda..78aa1f2c 100644
--- a/.github/workflows/build_base_vod.yaml
+++ b/.github/workflows/build_base_vod.yaml
@@ -16,13 +16,13 @@ jobs:
                     - os: alpine
                       os_version: "3.19"
                       golang: golang:1.22-alpine3.19
-                      platforms: linux/amd64,linux/arm64
+                      platforms: linux/amd64,linux/arm64,linux/arm/v7
                       branch: vod
                       key: alpine3.19
                     - os: alpine
                       os_version: "3.16"
                       golang: golang:1.19-alpine3.16
-                      platforms: linux/amd64,linux/arm64
+                      platforms: linux/amd64,linux/arm64,linux/arm/v7
                       branch: vod
                       key: alpine3.16
 

From e3138d6e6d5be42a2a5655c9ba962a591f41d7b0 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@datarhei.com>
Date: Wed, 13 Mar 2024 15:14:15 +0100
Subject: [PATCH 2/2] Remove cache layers

---
 .github/workflows/build_base_dev.yaml | 11 +----------
 .github/workflows/build_base_vod.yaml | 10 ----------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/.github/workflows/build_base_dev.yaml b/.github/workflows/build_base_dev.yaml
index 38261c89..a40d9fa3 100644
--- a/.github/workflows/build_base_dev.yaml
+++ b/.github/workflows/build_base_dev.yaml
@@ -50,14 +50,6 @@ jobs:
               id: buildx
               uses: docker/setup-buildx-action@master
 
-            - name: Cache Docker layers
-              uses: actions/cache@v4
-              with:
-                  path: /tmp/.buildx-cache
-                  key: ${{ runner.os }}-buildx-${{ github.sha }}
-                  restore-keys: |
-                      ${{ runner.os }}-buildx-
-
             - name: Login to DockerHub
               if: github.event_name != 'pull_request'
               uses: docker/login-action@v3
@@ -78,8 +70,7 @@ jobs:
                   push: true
                   tags: ${{ steps.meta.outputs.tags }}
                   labels: ${{ steps.meta.outputs.labels }}
-                  cache-from: type=local,src=/tmp/.buildx-cache
-                  cache-to: type=local,dest=/tmp/.buildx-cache-new
+
     bundle:
         needs: docker
         uses: ./.github/workflows/build_bundle_dev.yaml
diff --git a/.github/workflows/build_base_vod.yaml b/.github/workflows/build_base_vod.yaml
index 78aa1f2c..00dcf369 100644
--- a/.github/workflows/build_base_vod.yaml
+++ b/.github/workflows/build_base_vod.yaml
@@ -50,14 +50,6 @@ jobs:
               id: buildx
               uses: docker/setup-buildx-action@master
 
-            - name: Cache Docker layers
-              uses: actions/cache@v4
-              with:
-                  path: /tmp/.buildx-cache
-                  key: ${{ runner.os }}-buildx-${{ github.sha }}
-                  restore-keys: |
-                      ${{ runner.os }}-buildx-
-
             - name: Login to DockerHub
               if: github.event_name != 'pull_request'
               uses: docker/login-action@v3
@@ -78,5 +70,3 @@ jobs:
                   push: true
                   tags: ${{ steps.meta.outputs.tags }}
                   labels: ${{ steps.meta.outputs.labels }}
-                  cache-from: type=local,src=/tmp/.buildx-cache
-                  cache-to: type=local,dest=/tmp/.buildx-cache-new