From 12b32782a386cf8d65cc3400992a2f063dcc0b9b Mon Sep 17 00:00:00 2001 From: Andriy Biletsky Date: Thu, 19 Dec 2024 16:21:09 +0700 Subject: [PATCH] Bump alpine version --- Dockerfile | 2 +- build/forklift/Dockerfile | 2 +- build/uploads/Dockerfile | 2 +- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2bf5b8fc..c3e8b2cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 FROM odyseeteam/transcoder-ffmpeg:5.1.1 AS ffmpeg -FROM alpine:3.20 +FROM alpine:3.21 EXPOSE 8080 RUN apk update && \ diff --git a/build/forklift/Dockerfile b/build/forklift/Dockerfile index 322f9634..4fcc3f0f 100644 --- a/build/forklift/Dockerfile +++ b/build/forklift/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 FROM odyseeteam/transcoder-ffmpeg:5.1.1 AS ffmpeg -FROM alpine:3.17 +FROM alpine:3.21 EXPOSE 8080 COPY --from=ffmpeg /build/ffprobe /usr/local/bin/ diff --git a/build/uploads/Dockerfile b/build/uploads/Dockerfile index 5197c17a..cbba760a 100644 --- a/build/uploads/Dockerfile +++ b/build/uploads/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM alpine:3.17 +FROM alpine:3.21 EXPOSE 8080 # RUN apk add --no-cache libc6-compat diff --git a/go.mod b/go.mod index c277a45d..c3d4f293 100644 --- a/go.mod +++ b/go.mod @@ -221,7 +221,7 @@ require ( golang.org/x/arch v0.8.0 // indirect golang.org/x/crypto v0.31.0 // indirect golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.28.0 // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/sys v0.28.0 // indirect golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.5.0 // indirect diff --git a/go.sum b/go.sum index 40e9722f..df5f000a 100644 --- a/go.sum +++ b/go.sum @@ -2106,8 +2106,8 @@ golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=