From 6ab3751b5c005cf868d1114d3b20aedf12723533 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Tue, 25 Nov 2025 10:35:50 -0800
Subject: [PATCH] update golang to v1.25 (and some containers do debian
 bookworm) (#9442)

* bskyweb: bump go to v1.25

* update docker images to go v1.25 and debian bookworm

* bump CI to go v1.25
---
 .github/workflows/golang-test-lint.yml | 4 ++--
 Dockerfile                             | 4 ++--
 Dockerfile.embedr                      | 4 ++--
 bskyweb/go.mod                         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/golang-test-lint.yml b/.github/workflows/golang-test-lint.yml
index 82be6c9cd3..cd3e27cb7b 100644
--- a/.github/workflows/golang-test-lint.yml
+++ b/.github/workflows/golang-test-lint.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Go tooling
         uses: actions/setup-go@v3
         with:
-          go-version: "1.23"
+          go-version: "1.25"
       - name: Dummy Static Files
         run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
       - name: Check
@@ -36,7 +36,7 @@ jobs:
       - name: Set up Go tooling
         uses: actions/setup-go@v3
         with:
-          go-version: "1.23"
+          go-version: "1.25"
       - name: Dummy Static Files
         run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
       - name: Lint
diff --git a/Dockerfile b/Dockerfile
index 93b17a86b0..371e8402c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.24.5-bullseye AS build-env
+FROM golang:1.25-bookworm AS build-env
 
 WORKDIR /usr/src/social-app
 
@@ -89,7 +89,7 @@ RUN cd bskyweb/ && \
     -o /bskyweb \
     ./cmd/bskyweb
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 ENV GODEBUG=netdns=go
 ENV TZ=Etc/UTC
diff --git a/Dockerfile.embedr b/Dockerfile.embedr
index 7fa8b9ae53..29b042dddc 100644
--- a/Dockerfile.embedr
+++ b/Dockerfile.embedr
@@ -1,4 +1,4 @@
-FROM golang:1.24.5-bullseye AS build-env
+FROM golang:1.25-bookworm AS build-env
 
 WORKDIR /usr/src/social-app
 
@@ -58,7 +58,7 @@ RUN cd bskyweb/ && \
     -o /embedr \
     ./cmd/embedr
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 ENV GODEBUG=netdns=go
 ENV TZ=Etc/UTC
diff --git a/bskyweb/go.mod b/bskyweb/go.mod
index 407ba7d55d..654c40a131 100644
--- a/bskyweb/go.mod
+++ b/bskyweb/go.mod
@@ -1,6 +1,6 @@
 module github.com/bluesky-social/social-app/bskyweb
 
-go 1.24.5
+go 1.25
 
 require (
 	github.com/bluesky-social/indigo v0.0.0-20250729223159-573ae927246a