From ddba7bbf74a8b5a4ada7a30f9c23124603774037 Mon Sep 17 00:00:00 2001 From: Ingo Oppermann Date: Thu, 11 Jul 2024 12:22:50 +0200 Subject: [PATCH 1/5] Upgrade base image to alpine3.20 --- .github/workflows/build_base.yaml | 6 +++--- .github/workflows/build_base_dev.yaml | 6 +++--- .github/workflows/build_base_vod.yaml | 6 +++--- .github/workflows/build_bundle.yaml | 8 ++++---- .github/workflows/build_bundle_dev.yaml | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build_base.yaml b/.github/workflows/build_base.yaml index 799501b1..2ee4da0a 100644 --- a/.github/workflows/build_base.yaml +++ b/.github/workflows/build_base.yaml @@ -36,15 +36,15 @@ jobs: include: - core: ${{ needs.versions.outputs.coreversion }} os: alpine - os_version: "3.19" - golang: golang:1.22-alpine3.19 + os_version: "3.20" + golang: golang:1.22-alpine3.20 platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 branch: main latest: yes - core: ${{ needs.versions.outputs.coreversion }} os: ubuntu os_version: "22.04" - golang: golang:1.22-alpine3.19 + golang: golang:1.22-alpine3.20 platforms: linux/amd64 branch: main latest: yes diff --git a/.github/workflows/build_base_dev.yaml b/.github/workflows/build_base_dev.yaml index fd143c19..fa315333 100644 --- a/.github/workflows/build_base_dev.yaml +++ b/.github/workflows/build_base_dev.yaml @@ -16,13 +16,13 @@ jobs: matrix: include: - os: alpine - os_version: "3.19" - golang: golang:1.22-alpine3.19 + os_version: "3.20" + golang: golang:1.22-alpine3.20 platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 branch: dev - os: ubuntu os_version: "22.04" - golang: golang:1.22-alpine3.19 + golang: golang:1.22-alpine3.20 platforms: linux/amd64 branch: dev diff --git a/.github/workflows/build_base_vod.yaml b/.github/workflows/build_base_vod.yaml index f95c35b5..0bb9cba0 100644 --- a/.github/workflows/build_base_vod.yaml +++ b/.github/workflows/build_base_vod.yaml @@ -14,11 +14,11 @@ jobs: matrix: include: - os: alpine - os_version: "3.19" - golang: golang:1.22-alpine3.19 + os_version: "3.20" + golang: golang:1.22-alpine3.20 platforms: linux/amd64,linux/arm64,linux/arm/v7 branch: vod - key: alpine3.19 + key: alpine3.20 steps: - name: Checkout diff --git a/.github/workflows/build_bundle.yaml b/.github/workflows/build_bundle.yaml index 52b80fc6..095d10bb 100644 --- a/.github/workflows/build_bundle.yaml +++ b/.github/workflows/build_bundle.yaml @@ -35,17 +35,17 @@ jobs: matrix: include: - core: ${{ needs.versions.outputs.coreversion }} - core_os: alpine3.19 + core_os: alpine3.20 ffmpeg: "6.1.1" - ffmpeg_os: alpine3.19 + ffmpeg_os: alpine3.20 platforms: linux/amd64,linux/arm64,linux/arm/v7 branch: main prefix: latest: yes - core: ${{ needs.versions.outputs.coreversion }} - core_os: alpine3.19 + core_os: alpine3.20 ffmpeg: "6.1.1-rpi" - ffmpeg_os: alpine3.19 + ffmpeg_os: alpine3.20 platforms: linux/arm64,linux/arm/v7 branch: main prefix: rpi- diff --git a/.github/workflows/build_bundle_dev.yaml b/.github/workflows/build_bundle_dev.yaml index 09ec10a3..cc0a1e2e 100644 --- a/.github/workflows/build_bundle_dev.yaml +++ b/.github/workflows/build_bundle_dev.yaml @@ -13,16 +13,16 @@ jobs: strategy: matrix: include: - - core_os: alpine3.19 + - core_os: alpine3.20 ffmpeg: "6.1.1" - ffmpeg_os: alpine3.19 + ffmpeg_os: alpine3.20 platforms: linux/amd64,linux/arm64,linux/arm/v7 branch: dev prefix: latest: yes - - core_os: alpine3.19 + - core_os: alpine3.20 ffmpeg: "6.1.1-rpi" - ffmpeg_os: alpine3.19 + ffmpeg_os: alpine3.20 platforms: linux/arm64,linux/arm/v7 branch: dev prefix: rpi- From ca6dba7259b1aade93be9d9a15fc3544f37f61d2 Mon Sep 17 00:00:00 2001 From: Ingo Oppermann Date: Tue, 24 Sep 2024 11:47:25 +0200 Subject: [PATCH 2/5] Add ubuntu build for vod branch --- .github/workflows/build_base_vod.yaml | 6 +++++- Dockerfile | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_base_vod.yaml b/.github/workflows/build_base_vod.yaml index 0bb9cba0..523ee1a9 100644 --- a/.github/workflows/build_base_vod.yaml +++ b/.github/workflows/build_base_vod.yaml @@ -18,7 +18,11 @@ jobs: golang: golang:1.22-alpine3.20 platforms: linux/amd64,linux/arm64,linux/arm/v7 branch: vod - key: alpine3.20 + - os: ubuntu + os_version: "22.04" + golang: golang:1.22-alpine3.20 + platforms: linux/amd64 + branch: vod steps: - name: Checkout diff --git a/Dockerfile b/Dockerfile index 533b5c34..88733d40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BUILD_IMAGE=alpine:3.19 # Cross-Compilation # https://www.docker.com/blog/faster-multi-platform-builds-dockerfile-cross-compilation-guide/ -FROM --platform=$BUILDPLATFORM $GOLANG_IMAGE as builder +FROM --platform=$BUILDPLATFORM $GOLANG_IMAGE AS builder ARG TARGETOS TARGETARCH TARGETVARIANT ENV GOOS=$TARGETOS GOARCH=$TARGETARCH GOARM=$TARGETVARIANT From 65beedd281f35474e6f42d367fd0a99dd9dd54de Mon Sep 17 00:00:00 2001 From: Ingo Oppermann Date: Thu, 26 Sep 2024 14:13:59 +0200 Subject: [PATCH 3/5] Upgrade to ubuntu noble, add cuda 12 bundle --- .github/workflows/build_base_dev.yaml | 5 +++++ .github/workflows/build_base_vod.yaml | 2 +- .github/workflows/build_bundle_dev.yaml | 14 +++++++++++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_base_dev.yaml b/.github/workflows/build_base_dev.yaml index fa315333..6f187f1c 100644 --- a/.github/workflows/build_base_dev.yaml +++ b/.github/workflows/build_base_dev.yaml @@ -25,6 +25,11 @@ jobs: golang: golang:1.22-alpine3.20 platforms: linux/amd64 branch: dev + - os: ubuntu + os_version: "24.04" + golang: golang:1.22-alpine3.20 + platforms: linux/amd64 + branch: dev steps: - name: Checkout diff --git a/.github/workflows/build_base_vod.yaml b/.github/workflows/build_base_vod.yaml index 523ee1a9..c0fd6b43 100644 --- a/.github/workflows/build_base_vod.yaml +++ b/.github/workflows/build_base_vod.yaml @@ -19,7 +19,7 @@ jobs: platforms: linux/amd64,linux/arm64,linux/arm/v7 branch: vod - os: ubuntu - os_version: "22.04" + os_version: "24.04" golang: golang:1.22-alpine3.20 platforms: linux/amd64 branch: vod diff --git a/.github/workflows/build_bundle_dev.yaml b/.github/workflows/build_bundle_dev.yaml index cc0a1e2e..be81bfc2 100644 --- a/.github/workflows/build_bundle_dev.yaml +++ b/.github/workflows/build_bundle_dev.yaml @@ -27,9 +27,9 @@ jobs: branch: dev prefix: rpi- latest: yes - - core_os: ubuntu22.04 + - core_os: ubuntu24.04 ffmpeg: "6.1.1-vaapi" - ffmpeg_os: ubuntu22.04 + ffmpeg_os: ubuntu24.04 platforms: linux/amd64 branch: dev prefix: vaapi- @@ -37,7 +37,15 @@ jobs: - core_os: ubuntu22.04 ffmpeg: "6.1.1-cuda" ffmpeg_os: ubuntu22.04 - ffmpeg_tags: "-cuda11.7.1" + ffmpeg_tags: "-cuda11.8.0" + platforms: linux/amd64 + branch: dev + prefix: cuda- + latest: yes + - core_os: ubuntu24.04 + ffmpeg: "6.1.1-cuda" + ffmpeg_os: ubuntu24.04 + ffmpeg_tags: "-cuda12.6.1" platforms: linux/amd64 branch: dev prefix: cuda- From 2a8b01feaca9d0912fa9433bea47f2d85ed06eb7 Mon Sep 17 00:00:00 2001 From: Ingo Oppermann Date: Thu, 26 Sep 2024 15:03:59 +0200 Subject: [PATCH 4/5] Make cuda12 image latest --- .github/workflows/build_bundle_dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_bundle_dev.yaml b/.github/workflows/build_bundle_dev.yaml index be81bfc2..c7bddb04 100644 --- a/.github/workflows/build_bundle_dev.yaml +++ b/.github/workflows/build_bundle_dev.yaml @@ -41,7 +41,7 @@ jobs: platforms: linux/amd64 branch: dev prefix: cuda- - latest: yes + latest: no - core_os: ubuntu24.04 ffmpeg: "6.1.1-cuda" ffmpeg_os: ubuntu24.04 From 6f3e2caf0f9321e813f8a7951d881cf5a703db86 Mon Sep 17 00:00:00 2001 From: Ingo Oppermann Date: Tue, 1 Oct 2024 15:19:58 +0200 Subject: [PATCH 5/5] Build with go1.23 --- .github/workflows/build_base.yaml | 4 ++-- .github/workflows/build_base_dev.yaml | 6 +++--- .github/workflows/build_base_vod.yaml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_base.yaml b/.github/workflows/build_base.yaml index 2ee4da0a..c27c841b 100644 --- a/.github/workflows/build_base.yaml +++ b/.github/workflows/build_base.yaml @@ -37,14 +37,14 @@ jobs: - core: ${{ needs.versions.outputs.coreversion }} os: alpine os_version: "3.20" - golang: golang:1.22-alpine3.20 + golang: golang:1.23-alpine3.20 platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 branch: main latest: yes - core: ${{ needs.versions.outputs.coreversion }} os: ubuntu os_version: "22.04" - golang: golang:1.22-alpine3.20 + golang: golang:1.23-alpine3.20 platforms: linux/amd64 branch: main latest: yes diff --git a/.github/workflows/build_base_dev.yaml b/.github/workflows/build_base_dev.yaml index 6f187f1c..11b6f0cc 100644 --- a/.github/workflows/build_base_dev.yaml +++ b/.github/workflows/build_base_dev.yaml @@ -17,17 +17,17 @@ jobs: include: - os: alpine os_version: "3.20" - golang: golang:1.22-alpine3.20 + golang: golang:1.23-alpine3.20 platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 branch: dev - os: ubuntu os_version: "22.04" - golang: golang:1.22-alpine3.20 + golang: golang:1.23-alpine3.20 platforms: linux/amd64 branch: dev - os: ubuntu os_version: "24.04" - golang: golang:1.22-alpine3.20 + golang: golang:1.23-alpine3.20 platforms: linux/amd64 branch: dev diff --git a/.github/workflows/build_base_vod.yaml b/.github/workflows/build_base_vod.yaml index c0fd6b43..2d1c61f1 100644 --- a/.github/workflows/build_base_vod.yaml +++ b/.github/workflows/build_base_vod.yaml @@ -15,12 +15,12 @@ jobs: include: - os: alpine os_version: "3.20" - golang: golang:1.22-alpine3.20 + golang: golang:1.23-alpine3.20 platforms: linux/amd64,linux/arm64,linux/arm/v7 branch: vod - os: ubuntu os_version: "24.04" - golang: golang:1.22-alpine3.20 + golang: golang:1.23-alpine3.20 platforms: linux/amd64 branch: vod