diff --git a/Dockerfile b/Dockerfile index c276a3ce1..dcd2faf95 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ##################### ### Server Build Step ##################### -FROM --platform=${TARGETPLATFORM:-linux/amd64} golang:1.22-bullseye AS server-builder +FROM --platform=${TARGETPLATFORM:-linux/amd64} golang:1.22-bookworm AS server-builder RUN mkdir /server @@ -18,7 +18,7 @@ RUN COMMITHASH=${COMMITHASH} GOOS=${TARGETOS} GOARCH=${TARGETARCH} make build-se ################# ### UI Build Step ################# -FROM --platform=${TARGETPLATFORM:-linux/amd64} node:18-bullseye AS ui-builder +FROM --platform=${TARGETPLATFORM:-linux/amd64} node:22-bookworm AS ui-builder WORKDIR /ui @@ -32,7 +32,7 @@ RUN make build-ui ################ ### Runtime Step ################ -FROM --platform=${TARGETPLATFORM:-linux/amd64} debian:bullseye-slim +FROM --platform=${TARGETPLATFORM:-linux/amd64} debian:bookworm-slim RUN apt-get update RUN apt-get install -y ca-certificates diff --git a/go.mod b/go.mod index 5fbf301d0..caaa62604 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/goenning/letteravatar v0.0.0-20180605200324-553181ed4055 github.com/golang-jwt/jwt/v4 v4.1.0 github.com/golangci/golangci-lint v1.59.1 - github.com/gomarkdown/markdown v0.0.0-20220527210340-c82b80a9daf2 + github.com/gomarkdown/markdown v0.0.0-20240930133441-72d49d9543d8 github.com/gosimple/slug v1.11.0 github.com/gotnospirit/messageformat v0.0.0-20190719172517-c1d0bdacdea2 github.com/joeshaw/envdecode v0.0.0-20200121155833-099f1fc765bd diff --git a/go.sum b/go.sum index 2e99d7615..473e62f47 100644 --- a/go.sum +++ b/go.sum @@ -260,8 +260,8 @@ github.com/golangci/revgrep v0.5.3 h1:3tL7c1XBMtWHHqVpS5ChmiAAoe4PF/d5+ULzV9sLAz github.com/golangci/revgrep v0.5.3/go.mod h1:U4R/s9dlXZsg8uJmaR1GrloUr14D7qDl8gi2iPXJH8k= github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed h1:IURFTjxeTfNFP0hTEi1YKjB/ub8zkpaOqFFMApi2EAs= github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed/go.mod h1:XLXN8bNw4CGRPaqgl3bv/lhz7bsGPh4/xSaMTbo2vkQ= -github.com/gomarkdown/markdown v0.0.0-20220527210340-c82b80a9daf2 h1:VJwys0mqRBeVxECc/DyXgveOqOqI81J9sjQFZHZwJvs= -github.com/gomarkdown/markdown v0.0.0-20220527210340-c82b80a9daf2/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA= +github.com/gomarkdown/markdown v0.0.0-20240930133441-72d49d9543d8 h1:4txT5G2kqVAKMjzidIabL/8KqjIK71yj30YOeuxLn10= +github.com/gomarkdown/markdown v0.0.0-20240930133441-72d49d9543d8/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=