From 0822326900f2b469ef8a1336f8fbdcbf06c3c174 Mon Sep 17 00:00:00 2001 From: Sergey Krashevich Date: Wed, 23 Aug 2023 10:03:01 +0300 Subject: [PATCH 1/2] Update Go version to 1.21 in build and test workflows and Dockerfiles --- .github/workflows/build.yml | 2 +- .github/workflows/test.yml | 2 +- Dockerfile | 2 +- go.mod | 2 +- hardware.Dockerfile | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c524150a..e709fad7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 - with: { go-version: '1.20' } + with: { go-version: '1.21' } - name: Build go2rtc_win64 env: { GOOS: windows, GOARCH: amd64 } diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 99ec86bc..a98a83e5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,7 +26,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: '1.20' + go-version: '1.21' - name: Build Go binary run: go build -ldflags "-s -w" -trimpath -o ./go2rtc diff --git a/Dockerfile b/Dockerfile index 10936d45..f28f4e2f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # 0. Prepare images ARG PYTHON_VERSION="3.11" -ARG GO_VERSION="1.20" +ARG GO_VERSION="1.21" ARG NGROK_VERSION="3" FROM python:${PYTHON_VERSION}-alpine AS base diff --git a/go.mod b/go.mod index edc178f4..c2651e91 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/AlexxIT/go2rtc -go 1.20 +go 1.21 require ( github.com/gorilla/websocket v1.5.0 diff --git a/hardware.Dockerfile b/hardware.Dockerfile index 3c0bf7d8..893c0aa1 100644 --- a/hardware.Dockerfile +++ b/hardware.Dockerfile @@ -2,8 +2,8 @@ # 0. Prepare images # only debian 12 (bookworm) has latest ffmpeg -ARG DEBIAN_VERSION="bookworm-slim" -ARG GO_VERSION="1.20-buster" +ARG DEBIAN_VERSION="bullseye-slim" +ARG GO_VERSION="1.21-bullseye" ARG NGROK_VERSION="3" FROM debian:${DEBIAN_VERSION} AS base @@ -46,7 +46,7 @@ RUN rm -f /etc/apt/apt.conf.d/docker-clean \ # non-free for Intel QSV support (not used by go2rtc, just for tests) # libasound2-plugins for ALSA support RUN --mount=type=cache,target=/var/cache/apt,sharing=locked --mount=type=cache,target=/var/lib/apt,sharing=locked \ - echo 'deb http://deb.debian.org/debian bookworm non-free' > /etc/apt/sources.list.d/debian-non-free.list && \ + echo 'deb http://deb.debian.org/debian bullseye non-free' > /etc/apt/sources.list.d/debian-non-free.list && \ apt-get -y update && apt-get -y install tini ffmpeg \ python3 curl jq \ intel-media-va-driver-non-free \ From 065a6f4f4685d3d2a0bfb6a355d7c3158621c35d Mon Sep 17 00:00:00 2001 From: Sergey Krashevich Date: Wed, 23 Aug 2023 17:02:58 +0300 Subject: [PATCH 2/2] Update Debian and Go versions to bookworm-slim and 1.21-bookworm respectively in hardware.Dockerfile --- hardware.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hardware.Dockerfile b/hardware.Dockerfile index 893c0aa1..b3e064c6 100644 --- a/hardware.Dockerfile +++ b/hardware.Dockerfile @@ -2,8 +2,8 @@ # 0. Prepare images # only debian 12 (bookworm) has latest ffmpeg -ARG DEBIAN_VERSION="bullseye-slim" -ARG GO_VERSION="1.21-bullseye" +ARG DEBIAN_VERSION="bookworm-slim" +ARG GO_VERSION="1.21-bookworm" ARG NGROK_VERSION="3" FROM debian:${DEBIAN_VERSION} AS base @@ -46,7 +46,7 @@ RUN rm -f /etc/apt/apt.conf.d/docker-clean \ # non-free for Intel QSV support (not used by go2rtc, just for tests) # libasound2-plugins for ALSA support RUN --mount=type=cache,target=/var/cache/apt,sharing=locked --mount=type=cache,target=/var/lib/apt,sharing=locked \ - echo 'deb http://deb.debian.org/debian bullseye non-free' > /etc/apt/sources.list.d/debian-non-free.list && \ + echo 'deb http://deb.debian.org/debian bookworm non-free' > /etc/apt/sources.list.d/debian-non-free.list && \ apt-get -y update && apt-get -y install tini ffmpeg \ python3 curl jq \ intel-media-va-driver-non-free \