From 27d4ff1f7ce35a3946cdfa2279c3222660e4d259 Mon Sep 17 00:00:00 2001 From: Carlos Herrero Date: Tue, 10 Mar 2026 12:56:15 +0100 Subject: [PATCH] Update Go version reference in docs and update in Dockerfiles --- Dockerfile | 2 +- README.md | 4 +++- docs/guides/deployment.md | 4 ++-- docs/guides/plugin-development.md | 10 +++++----- docs/tutorials/microsoft-sam-mux.md | 2 +- scripts/test-distributor-workflow.sh | 2 +- test/Dockerfile.echoserver | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index ce630e1..9d701e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ # ============================================================================= # Stage 1: Builder # ============================================================================= -FROM golang:1.25-alpine AS builder +FROM golang:1.26-alpine AS builder # Install git for version info (optional) and ca-certificates RUN apk add --no-cache git ca-certificates diff --git a/README.md b/README.md index f10217d..e656e02 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@
chaperone_banner

- +

@@ -48,6 +48,8 @@ make tools && make build-dev ./bin/chaperone -config configs/getting-started.yaml ``` +Go version requirement is defined in `go.mod` (source of truth). + ## Documentation | Document | Description | diff --git a/docs/guides/deployment.md b/docs/guides/deployment.md index 34297d1..e3dc1bf 100644 --- a/docs/guides/deployment.md +++ b/docs/guides/deployment.md @@ -16,7 +16,7 @@ it into a production-ready container. | Requirement | Version | Purpose | |-------------|---------|---------| -| **Go** | 1.25+ | Building custom binaries | +| **Go** | 1.26+ | Building custom binaries | | **Docker** | 20.10+ | Containerized deployment | | **A working plugin project** | — | From the [Plugin Development Guide](plugin-development.md) | @@ -54,7 +54,7 @@ that compiles **your** code. This is the typical production scenario. Create `Dockerfile` in your plugin project root (`my-proxy/`): ```dockerfile -FROM golang:1.25-alpine AS builder +FROM golang:1.26-alpine AS builder WORKDIR /build # Copy your project and build. diff --git a/docs/guides/plugin-development.md b/docs/guides/plugin-development.md index 67beaf5..5321b35 100644 --- a/docs/guides/plugin-development.md +++ b/docs/guides/plugin-development.md @@ -18,10 +18,10 @@ plugin that injects a custom header into every proxied request. ## Prerequisites -| Requirement | Version | Purpose | -|-------------|---------|---------| -| **Go** | 1.25+ | Building the plugin binary ([install Go](https://go.dev/doc/install)) | -| **curl** | any | Sending test requests | +| Requirement | Version | Purpose | +| ----------- | ------------------------ | --------------------------------------------------------------- | +| **Go** | 1.26+ | Building the plugin binary ([install Go](https://go.dev/doc/install)) | +| **curl** | any | Sending test requests | > **Recommended:** Complete the [Getting Started](../getting-started.md) > tutorial first. It introduces the proxy, configuration, allow-lists, @@ -71,7 +71,7 @@ This creates a `go.mod` like: ```go module github.com/acme/my-proxy -go 1.25 +go 1.26 require ( github.com/cloudblue/chaperone v0.1.0 diff --git a/docs/tutorials/microsoft-sam-mux.md b/docs/tutorials/microsoft-sam-mux.md index cf30065..0eb65a6 100644 --- a/docs/tutorials/microsoft-sam-mux.md +++ b/docs/tutorials/microsoft-sam-mux.md @@ -8,7 +8,7 @@ Build a Chaperone proxy that authenticates requests to Microsoft APIs using the | Requirement | Version | Purpose | |-------------|---------|---------| -| **Go** | 1.25+ | Building the proxy binary ([install Go](https://go.dev/doc/install)) | +| **Go** | 1.26+ | Building the proxy binary ([install Go](https://go.dev/doc/install)) | | **Chaperone source** | — | SDK, Core, and Contrib modules (cloned in [Getting Started](../getting-started.md)) | | **curl** | any | Sending test requests | | **Microsoft Entra ID app registration** | — | Client ID, client secret, and an account with admin consent permissions ([quickstart](https://learn.microsoft.com/en-us/entra/identity-platform/quickstart-register-app)) | diff --git a/scripts/test-distributor-workflow.sh b/scripts/test-distributor-workflow.sh index b0576ad..17eb97c 100755 --- a/scripts/test-distributor-workflow.sh +++ b/scripts/test-distributor-workflow.sh @@ -17,7 +17,7 @@ set -euo pipefail REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)" -# Create a workspace under the user's home to avoid Go 1.25+ temp root +# Create a workspace under the user's home to avoid system temp root # restrictions (Go ignores go.mod in system temp roots). WORK_DIR="${HOME}/.cache/chaperone-distributor-test" rm -rf "$WORK_DIR" diff --git a/test/Dockerfile.echoserver b/test/Dockerfile.echoserver index e59e71c..57b7d20 100644 --- a/test/Dockerfile.echoserver +++ b/test/Dockerfile.echoserver @@ -8,7 +8,7 @@ # Used by: make docker-test # NOT a production artifact. -FROM golang:1.25-alpine AS builder +FROM golang:1.26-alpine AS builder WORKDIR /build