From 4cd0735676fe7708957a83173ec3fcd3b1586dd5 Mon Sep 17 00:00:00 2001
From: Shiloh Heurich <sheurich@fastly.com>
Date: Sat, 17 Feb 2024 16:17:49 -0500
Subject: [PATCH] upgrade to go v1.21

---
 .travis.yml                                   | 2 +-
 docker/pebble-challtestsrv/linux.Dockerfile   | 2 +-
 docker/pebble-challtestsrv/windows.Dockerfile | 2 +-
 docker/pebble/linux.Dockerfile                | 2 +-
 docker/pebble/windows.Dockerfile              | 2 +-
 go.mod                                        | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 67e534b..b745d3a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ cache:
     - $GOPATH/pkg/mod
 
 go:
-  - "1.18.x"
+  - "1.21.x"
 
 services:
   - docker
diff --git a/docker/pebble-challtestsrv/linux.Dockerfile b/docker/pebble-challtestsrv/linux.Dockerfile
index 4566ea2..e187fd1 100644
--- a/docker/pebble-challtestsrv/linux.Dockerfile
+++ b/docker/pebble-challtestsrv/linux.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18-alpine as builder
+FROM golang:1.21-alpine as builder
 
 ENV CGO_ENABLED=0
 
diff --git a/docker/pebble-challtestsrv/windows.Dockerfile b/docker/pebble-challtestsrv/windows.Dockerfile
index d039d4b..667a19a 100644
--- a/docker/pebble-challtestsrv/windows.Dockerfile
+++ b/docker/pebble-challtestsrv/windows.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18-nanoserver-sac2016 as builder
+FROM golang:1.21-nanoserver-sac2016 as builder
 
 ENV CGO_ENABLED=0
 
diff --git a/docker/pebble/linux.Dockerfile b/docker/pebble/linux.Dockerfile
index d8ba358..9f2d3d0 100644
--- a/docker/pebble/linux.Dockerfile
+++ b/docker/pebble/linux.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18-alpine as builder
+FROM golang:1.21-alpine as builder
 
 ENV CGO_ENABLED=0
 
diff --git a/docker/pebble/windows.Dockerfile b/docker/pebble/windows.Dockerfile
index fcec960..e56713a 100644
--- a/docker/pebble/windows.Dockerfile
+++ b/docker/pebble/windows.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18-nanoserver-sac2016 as builder
+FROM golang:1.21-nanoserver-sac2016 as builder
 
 ENV CGO_ENABLED=0
 
diff --git a/go.mod b/go.mod
index 12fdc95..77bdc85 100644
--- a/go.mod
+++ b/go.mod
@@ -1,5 +1,7 @@
 module github.com/letsencrypt/pebble/v2
 
+go 1.21
+
 require (
 	github.com/letsencrypt/challtestsrv v1.3.2
 	github.com/miekg/dns v1.1.48
@@ -16,5 +18,3 @@ require (
 	golang.org/x/tools v0.1.10 // indirect
 	golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
 )
-
-go 1.17