From 4917deb187f183e7707769cea548609ac0e4bf81 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@datarhei.com>
Date: Mon, 19 Feb 2024 15:15:34 +0100
Subject: [PATCH] Update dev bundles

---
 .github/workflows/build_bundle-rpi_dev.yaml | 117 ++++++++++----------
 .github/workflows/build_bundle_dev.yaml     | 117 ++++++++++----------
 .github_build/Build.bundle.dev.env          |   2 +
 .github_build/Build.bundle.rpi.dev.env      |   2 +
 4 files changed, 122 insertions(+), 116 deletions(-)
 create mode 100644 .github_build/Build.bundle.dev.env
 create mode 100644 .github_build/Build.bundle.rpi.dev.env

diff --git a/.github/workflows/build_bundle-rpi_dev.yaml b/.github/workflows/build_bundle-rpi_dev.yaml
index e26f44f7..b6618eb7 100644
--- a/.github/workflows/build_bundle-rpi_dev.yaml
+++ b/.github/workflows/build_bundle-rpi_dev.yaml
@@ -1,69 +1,70 @@
-name: 'Build datarhei/core:rpi-dev'
+name: "Build datarhei/core:rpi-dev bundle"
 
 on:
-  workflow_dispatch:
-  workflow_call:
-  push:
-    branches-ignore:
-      - '**'
+    workflow_dispatch:
+    workflow_call:
+    push:
+        branches-ignore:
+            - "**"
 
 jobs:
-  docker:
-    runs-on: [self-hosted]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+    docker:
+        runs-on: [self-hosted]
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
 
-      - uses: cardinalby/export-env-action@v1
-        with:
-          envFile: '.github_build/Build.alpine.env'
-          export: 'true'
-          expandWithJobEnv: 'true'
-          expand: 'true'
+            - uses: cardinalby/export-env-action@v1
+              with:
+                  envFile: ".github_build/Build.alpine.env"
+                  export: "true"
+                  expandWithJobEnv: "true"
+                  expand: "true"
 
-      - uses: cardinalby/export-env-action@v1
-        with:
-          envFile: '.github_build/Build.bundle.rpi.env'
-          export: 'true'
-          expandWithJobEnv: 'true'
-          expand: 'true'
+            - uses: cardinalby/export-env-action@v1
+              with:
+                  envFile: ".github_build/Build.bundle.rpi.dev.env"
+                  export: "true"
+                  expandWithJobEnv: "true"
+                  expand: "true"
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@master
-        with:
-          platforms: all
+            - name: Set up QEMU
+              uses: docker/setup-qemu-action@master
+              with:
+                  platforms: all
 
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@master
+            - name: Set up Docker Buildx
+              id: buildx
+              uses: docker/setup-buildx-action@master
 
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
+            - name: Cache Docker layers
+              uses: actions/cache@v2
+              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@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+            - name: Login to DockerHub
+              if: github.event_name != 'pull_request'
+              uses: docker/login-action@v1
+              with:
+                  username: ${{ secrets.DOCKER_USERNAME }}
+                  password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build Multi-Arch
-        uses: docker/build-push-action@v2
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          context: .
-          file: ./Dockerfile.bundle
-          build-args: |
-            CORE_IMAGE=datarhei/base:${{ env.OS_NAME }}-core-dev
-            FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-rpi-${{ env.OS_VERSION_FFMPEG }}-${{ env.FFMPEG_VERSION }}
-          platforms: linux/arm64,linux/arm/v7
-          push: true
-          tags: |
-            datarhei/core:rpi-dev
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
+            - name: Build Multi-Arch
+              uses: docker/build-push-action@v2
+              with:
+                  builder: ${{ steps.buildx.outputs.name }}
+                  context: .
+                  file: ./Dockerfile.bundle
+                  build-args: |
+                      CORE_IMAGE=datarhei/base:core-dev-${{ env.OS_NAME }}${{ env.OS_VERSION }}
+                      FFMPEG_IMAGE=datarhei/base:ffmpeg${{ env.FFMPEG_VERSION }}-rpi-${{ env.OS_NAME }}${{ env.OS_VERSION }}
+                  platforms: linux/arm64,linux/arm/v7
+                  push: true
+                  tags: |
+                      datarhei/core:rpi-dev
+                      datarhei/core:rpi-dev-ffmpeg${{ env.FFMPEG_VERSION }}-${{ env.OS_NAME }}${{ env.OS_VERSION }}
+                  cache-from: type=local,src=/tmp/.buildx-cache
+                  cache-to: type=local,dest=/tmp/.buildx-cache-new
diff --git a/.github/workflows/build_bundle_dev.yaml b/.github/workflows/build_bundle_dev.yaml
index b8463f6a..dc788810 100644
--- a/.github/workflows/build_bundle_dev.yaml
+++ b/.github/workflows/build_bundle_dev.yaml
@@ -1,69 +1,70 @@
-name: 'Build datarhei/core:dev'
+name: "Build datarhei/core:dev bundle"
 
 on:
-  workflow_dispatch:
-  workflow_call:
-  push:
-    branches-ignore:
-      - '**'
+    workflow_dispatch:
+    workflow_call:
+    push:
+        branches-ignore:
+            - "**"
 
 jobs:
-  docker:
-    runs-on: [self-hosted]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+    docker:
+        runs-on: [self-hosted]
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
 
-      - uses: cardinalby/export-env-action@v1
-        with:
-          envFile: '.github_build/Build.alpine.env'
-          export: 'true'
-          expandWithJobEnv: 'true'
-          expand: 'true'
+            - uses: cardinalby/export-env-action@v1
+              with:
+                  envFile: ".github_build/Build.alpine.env"
+                  export: "true"
+                  expandWithJobEnv: "true"
+                  expand: "true"
 
-      - uses: cardinalby/export-env-action@v1
-        with:
-          envFile: '.github_build/Build.bundle.env'
-          export: 'true'
-          expandWithJobEnv: 'true'
-          expand: 'true'
+            - uses: cardinalby/export-env-action@v1
+              with:
+                  envFile: ".github_build/Build.bundle.dev.env"
+                  export: "true"
+                  expandWithJobEnv: "true"
+                  expand: "true"
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@master
-        with:
-          platforms: all
+            - name: Set up QEMU
+              uses: docker/setup-qemu-action@master
+              with:
+                  platforms: all
 
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@master
+            - name: Set up Docker Buildx
+              id: buildx
+              uses: docker/setup-buildx-action@master
 
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
+            - name: Cache Docker layers
+              uses: actions/cache@v2
+              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@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+            - name: Login to DockerHub
+              if: github.event_name != 'pull_request'
+              uses: docker/login-action@v1
+              with:
+                  username: ${{ secrets.DOCKER_USERNAME }}
+                  password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build Multi-Arch
-        uses: docker/build-push-action@v2
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          context: .
-          file: ./Dockerfile.bundle
-          build-args: |
-            CORE_IMAGE=datarhei/base:${{ env.OS_NAME }}-core-dev
-            FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-${{ env.OS_VERSION_FFMPEG }}-${{ env.FFMPEG_VERSION }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          push: true
-          tags: |
-            datarhei/core:dev
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
+            - name: Build Multi-Arch
+              uses: docker/build-push-action@v2
+              with:
+                  builder: ${{ steps.buildx.outputs.name }}
+                  context: .
+                  file: ./Dockerfile.bundle
+                  build-args: |
+                      CORE_IMAGE=datarhei/base:core-dev-${{ env.OS_NAME }}${{ env.OS_VERSION }}
+                      FFMPEG_IMAGE=datarhei/base:ffmpeg${{ env.FFMPEG_VERSION }}-${{ env.OS_NAME }}${{ env.OS_VERSION }}
+                  platforms: linux/amd64,linux/arm64,linux/arm/v7
+                  push: true
+                  tags: |
+                      datarhei/core:dev
+                      datarhei/core:dev-ffmpeg${{ env.FFMPEG_VERSION }}-${{ env.OS_NAME }}${{ env.OS_VERSION }}
+                  cache-from: type=local,src=/tmp/.buildx-cache
+                  cache-to: type=local,dest=/tmp/.buildx-cache-new
diff --git a/.github_build/Build.bundle.dev.env b/.github_build/Build.bundle.dev.env
new file mode 100644
index 00000000..fb5499d0
--- /dev/null
+++ b/.github_build/Build.bundle.dev.env
@@ -0,0 +1,2 @@
+# CORE DEV BUNDLE
+FFMPEG_VERSION=6.1.1
diff --git a/.github_build/Build.bundle.rpi.dev.env b/.github_build/Build.bundle.rpi.dev.env
new file mode 100644
index 00000000..dd64c2f3
--- /dev/null
+++ b/.github_build/Build.bundle.rpi.dev.env
@@ -0,0 +1,2 @@
+# CORE RASPBERRY-PI DEV BUNDLE
+FFMPEG_VERSION=6.1.1