diff --git a/.github/workflows/build_base.yaml b/.github/workflows/build_base.yaml index 799501b1..c27c841b 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.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.19 + 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 fd143c19..11b6f0cc 100644 --- a/.github/workflows/build_base_dev.yaml +++ b/.github/workflows/build_base_dev.yaml @@ -16,13 +16,18 @@ jobs: matrix: include: - os: alpine - os_version: "3.19" - golang: golang:1.22-alpine3.19 + os_version: "3.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.19 + golang: golang:1.23-alpine3.20 + platforms: linux/amd64 + branch: dev + - os: ubuntu + os_version: "24.04" + 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 f95c35b5..2d1c61f1 100644 --- a/.github/workflows/build_base_vod.yaml +++ b/.github/workflows/build_base_vod.yaml @@ -14,11 +14,15 @@ jobs: matrix: include: - os: alpine - os_version: "3.19" - golang: golang:1.22-alpine3.19 + os_version: "3.20" + golang: golang:1.23-alpine3.20 platforms: linux/amd64,linux/arm64,linux/arm/v7 branch: vod - key: alpine3.19 + - os: ubuntu + os_version: "24.04" + golang: golang:1.23-alpine3.20 + platforms: linux/amd64 + branch: vod 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..c7bddb04 100644 --- a/.github/workflows/build_bundle_dev.yaml +++ b/.github/workflows/build_bundle_dev.yaml @@ -13,23 +13,23 @@ 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- 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: no + - 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- 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