Skip to content

Commit dd6bf9d

Browse files
authored
Merge pull request #1215 from kimtiago/dockerfile
Update Markdown dependency and Dockerfile to Debian Bookworm / Node.js 22
2 parents db28ecc + 46ed2bc commit dd6bf9d

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#####################
22
### Server Build Step
33
#####################
4-
FROM --platform=${TARGETPLATFORM:-linux/amd64} golang:1.22-bullseye AS server-builder
4+
FROM --platform=${TARGETPLATFORM:-linux/amd64} golang:1.22-bookworm AS server-builder
55

66

77
RUN mkdir /server
@@ -18,7 +18,7 @@ RUN COMMITHASH=${COMMITHASH} GOOS=${TARGETOS} GOARCH=${TARGETARCH} make build-se
1818
#################
1919
### UI Build Step
2020
#################
21-
FROM --platform=${TARGETPLATFORM:-linux/amd64} node:18-bullseye AS ui-builder
21+
FROM --platform=${TARGETPLATFORM:-linux/amd64} node:22-bookworm AS ui-builder
2222

2323
WORKDIR /ui
2424

@@ -32,7 +32,7 @@ RUN make build-ui
3232
################
3333
### Runtime Step
3434
################
35-
FROM --platform=${TARGETPLATFORM:-linux/amd64} debian:bullseye-slim
35+
FROM --platform=${TARGETPLATFORM:-linux/amd64} debian:bookworm-slim
3636

3737
RUN apt-get update
3838
RUN apt-get install -y ca-certificates

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/goenning/letteravatar v0.0.0-20180605200324-553181ed4055
1212
github.com/golang-jwt/jwt/v4 v4.1.0
1313
github.com/golangci/golangci-lint v1.59.1
14-
github.com/gomarkdown/markdown v0.0.0-20220527210340-c82b80a9daf2
14+
github.com/gomarkdown/markdown v0.0.0-20240930133441-72d49d9543d8
1515
github.com/gosimple/slug v1.11.0
1616
github.com/gotnospirit/messageformat v0.0.0-20190719172517-c1d0bdacdea2
1717
github.com/joeshaw/envdecode v0.0.0-20200121155833-099f1fc765bd

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ github.com/golangci/revgrep v0.5.3 h1:3tL7c1XBMtWHHqVpS5ChmiAAoe4PF/d5+ULzV9sLAz
260260
github.com/golangci/revgrep v0.5.3/go.mod h1:U4R/s9dlXZsg8uJmaR1GrloUr14D7qDl8gi2iPXJH8k=
261261
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed h1:IURFTjxeTfNFP0hTEi1YKjB/ub8zkpaOqFFMApi2EAs=
262262
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed/go.mod h1:XLXN8bNw4CGRPaqgl3bv/lhz7bsGPh4/xSaMTbo2vkQ=
263-
github.com/gomarkdown/markdown v0.0.0-20220527210340-c82b80a9daf2 h1:VJwys0mqRBeVxECc/DyXgveOqOqI81J9sjQFZHZwJvs=
264-
github.com/gomarkdown/markdown v0.0.0-20220527210340-c82b80a9daf2/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
263+
github.com/gomarkdown/markdown v0.0.0-20240930133441-72d49d9543d8 h1:4txT5G2kqVAKMjzidIabL/8KqjIK71yj30YOeuxLn10=
264+
github.com/gomarkdown/markdown v0.0.0-20240930133441-72d49d9543d8/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
265265
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
266266
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
267267
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=

0 commit comments

Comments
 (0)