diff --git a/.github/workflows/code_lint.yml b/.github/workflows/code_lint.yml index 136aad09..a9a6b0f7 100644 --- a/.github/workflows/code_lint.yml +++ b/.github/workflows/code_lint.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-go@v6 with: - go-version: "1.24" + go-version: "1.25" - run: go generate ./... @@ -33,7 +33,7 @@ jobs: - uses: actions/setup-go@v6 with: - go-version: "1.24" + go-version: "1.25" - run: make lint-go-mod diff --git a/.github/workflows/code_test.yml b/.github/workflows/code_test.yml index a55385b9..911e0894 100644 --- a/.github/workflows/code_test.yml +++ b/.github/workflows/code_test.yml @@ -41,6 +41,6 @@ jobs: - uses: actions/setup-go@v6 with: - go-version: "1.24" + go-version: "1.25" - run: make test-e2e-nodocker diff --git a/Makefile b/Makefile index b7d30919..257ce894 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ -BASE_IMAGE = golang:1.24-alpine3.20 +BASE_IMAGE = golang:1.25-alpine3.22 GOLANGCI_LINT_IMAGE = golangci/golangci-lint:v2.4.0 -NODE_IMAGE = node:20-alpine3.20 +NODE_IMAGE = node:20-alpine3.22 .PHONY: $(shell ls) diff --git a/docker/ffmpeg.Dockerfile b/docker/ffmpeg.Dockerfile index 1b2f08fc..0f9a34ba 100644 --- a/docker/ffmpeg.Dockerfile +++ b/docker/ffmpeg.Dockerfile @@ -7,7 +7,7 @@ ADD binaries/mediamtx_*_linux_armv7.tar.gz /linux/arm/v7 ADD binaries/mediamtx_*_linux_arm64.tar.gz /linux/arm64 ################################################################# -FROM alpine:3.20 +FROM alpine:3.22 RUN apk add --no-cache ffmpeg diff --git a/docs/4-other/1-compile.md b/docs/4-other/1-compile.md index 1a8ee3b2..d874d5a8 100644 --- a/docs/4-other/1-compile.md +++ b/docs/4-other/1-compile.md @@ -2,7 +2,7 @@ ## Standard method -Install git and Go ≥ 1.24. Clone the repository, enter into the folder and start the building process: +Install git and Go ≥ 1.25. Clone the repository, enter into the folder and start the building process: ```sh git clone https://github.com/bluenviron/mediamtx @@ -59,7 +59,7 @@ If you need to use a custom or external libcamera when interacting with the Rasp Cross compilation allows to build an executable for a target machine from another machine with different operating system or architecture. This is useful in case the target machine doesn't have enough resources for compilation or if you don't want to install the compilation dependencies on it. -On the machine you want to use to compile, install git and Go ≥ 1.24. Clone the repository, enter into the folder and start the building process: +On the machine you want to use to compile, install git and Go ≥ 1.25. Clone the repository, enter into the folder and start the building process: ```sh git clone https://github.com/bluenviron/mediamtx diff --git a/go.mod b/go.mod index b26506f0..ac5a1d79 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/bluenviron/mediamtx -go 1.24.0 +go 1.25.0 require ( code.cloudfoundry.org/bytefmt v0.50.0