Skip to content

Commit 55240ca

Browse files
authored
Update FFmpeg image (#2749)
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 5c0402b commit 55240ca

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.ffmpeg/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ ARG GO_VERSION="latest"
55
ARG GO_CRYPTO_VERSION="v0.35.0"
66
ARG GO_OAUTH2_VERSION="v0.27.0"
77
ARG GO_NET_VERSION="v0.36.0"
8+
ARG GOLANG_JWT_V4_VERSION="v4.5.2"
9+
ARG GOLANG_JWT_V5_VERSION="v5.2.2"
810

911
USER root
1012

@@ -38,6 +40,8 @@ RUN cd /usr/local/src \
3840
&& sed -i "s|golang.org/x/crypto v.*|golang.org/x/crypto ${GO_CRYPTO_VERSION}|g" go.mod \
3941
&& sed -i "s|golang.org/x/oauth2 v.*|golang.org/x/oauth2 ${GO_OAUTH2_VERSION}|g" go.mod \
4042
&& sed -i "s|golang.org/x/net v.*|golang.org/x/net ${GO_NET_VERSION}|g" go.mod \
43+
&& sed -i "s|github.com/golang-jwt/jwt/v5 v.*|github.com/golang-jwt/jwt/v5 v5.2.2|g" go.mod \
44+
&& sed -i "s|github.com/golang-jwt/jwt/v4 v.*|github.com/golang-jwt/jwt/v4 v4.5.2|g" go.mod \
4145
&& go mod tidy \
4246
# Build rclone
4347
&& make \

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ BUILD_ARGS := $(BUILD_ARGS) --progress plain
1919
MAJOR := $(word 1,$(subst ., ,$(TAG_VERSION)))
2020
MINOR := $(word 2,$(subst ., ,$(TAG_VERSION)))
2121
MAJOR_MINOR_PATCH := $(word 1,$(subst -, ,$(TAG_VERSION)))
22-
FFMPEG_VERSION := $(or $(FFMPEG_VERSION),$(FFMPEG_VERSION),7.1.1)
22+
FFMPEG_VERSION := $(or $(FFMPEG_VERSION),$(FFMPEG_VERSION),7.1)
2323
FFMPEG_TAG_PREV_VERSION := $(or $(FFMPEG_TAG_PREV_VERSION),$(FFMPEG_TAG_PREV_VERSION),ffmpeg-7.1.1.1)
24-
FFMPEG_TAG_VERSION := $(or $(FFMPEG_TAG_VERSION),$(FFMPEG_TAG_VERSION),ffmpeg-7.1.1.1.1)
24+
FFMPEG_TAG_VERSION := $(or $(FFMPEG_TAG_VERSION),$(FFMPEG_TAG_VERSION),ffmpeg-7.1)
2525
FFMPEG_BASED_NAME := $(or $(FFMPEG_BASED_NAME),$(FFMPEG_BASED_NAME),selenium)
2626
FFMPEG_BASED_TAG := $(or $(FFMPEG_BASED_TAG),$(FFMPEG_BASED_TAG),latest)
2727
CURRENT_PLATFORM := $(shell if [ `arch` = "aarch64" ] || [ `arch` = "arm64" ]; then echo "linux/arm64"; else echo "linux/amd64"; fi)

0 commit comments

Comments
 (0)