Merge branch 'v2' of github.com:traPtitech/Jomon into samber_lo_adapt

traPtitech · Oct 1, 2024 · 80577a7 · 80577a7
2 parents efc7ca4 + 72b3b86
commit 80577a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 ## build backend
-FROM golang:1.23.0-alpine as server-build
+FROM golang:1.23.1-alpine as server-build
 
 WORKDIR /github.com/traPtitech/Jomon
 COPY go.mod go.sum ./
@@ -11,7 +11,7 @@ RUN go build -o /Jomon -ldflags "-s -w"
 
 ## run
 
-FROM alpine:3.20.2
+FROM alpine:3.20.3
 ENV TZ Asia/Tokyo
 
 RUN apk --update --no-cache add tzdata \

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM golang:1.23.0-alpine as build
+FROM golang:1.23.1-alpine as build
 ENV CGO_ENABLED 0
 ENV TZ Asia/Tokyo