diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 6514b886f..840a8484c 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -8,7 +8,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \ NVM_DIR=/usr/local/share/nvm \ PATH=$GOPATH/bin:/usr/local/bin:/usr/local/go/bin:/usr/local/cargo/bin:$PATH \ RUST_VERSION=1.91.1 \ - GOLANG_VERSION=1.24.3 \ + GOLANG_VERSION=1.26.2 \ NODE_VERSION=20 \ PNPM_VERSION=latest \ NVM_VERSION=latest diff --git a/docker/tavern.Dockerfile b/docker/tavern.Dockerfile index ab26af3b5..60c7c1c52 100644 --- a/docker/tavern.Dockerfile +++ b/docker/tavern.Dockerfile @@ -1,5 +1,5 @@ # Dependency Cache -FROM golang:1.24.0-bookworm as base +FROM golang:1.26.2-trixie as base WORKDIR /app RUN mkdir -p /app/build /app/cdn COPY ./go.mod /app/go.mod @@ -20,7 +20,7 @@ RUN CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags='-w -s -extldflags RUN go build -ldflags='-w -extldflags "-static"' -o /app/build/tavern ./tavern # Production -FROM debian:bookworm as production +FROM debian:trixie as production WORKDIR /app CMD ["/app/tavern"] EXPOSE 80 443 8080 diff --git a/go.mod b/go.mod index 49300720b..9da84b670 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module realm.pub -go 1.25.0 +go 1.26.2 require ( cloud.google.com/go/pubsub/v2 v2.5.0