Housekeeping

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
     branches: [main]
 
 env:
-  GO_VERSION: '1.25'
+  GO_VERSION: '1.26'
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
 

Dockerfile

@@ -1,6 +1,6 @@
 # Stage 1: Build step-ca with acme-proxy plugin
 
-FROM golang:1.25.5-trixie AS build
+FROM golang:1.26.2-trixie AS build
 
 WORKDIR /build
 

Makefile

@@ -1,6 +1,4 @@
 APP_NAME = step-ca
-VERSION = v0.30.2
-UPSTREAM = https://github.com/smallstep/certificates.git
 
 SUDO := $(shell if [ $$(id -u) -ne 0 ]; then echo "$(SUDO)"; else echo ""; fi)
 
@@ -14,7 +12,6 @@ clean:
 	go clean -cache
 	rm -f step-ca
 	rm -rf db
-	rm -rf .build
 
 check-deps:
 	@echo "🔍 Checking for libpcsclite-dev dependency..."
@@ -43,17 +40,12 @@ check-deps:
 
 dev: clean check-deps
 	@echo "⬇️ Downloading dependencies to create dev environment..."
-	git clone --branch $(VERSION) --depth 1 $(UPSTREAM) .build/certificates/
-	rm -rf .build/certificates/server && cp -r ./hack/server .build/certificates/server
 	mkdir db
 	go mod tidy
 	@echo "✅ Ready"
 
 build: clean check-deps
 	@echo "⚙️ Building ACME proxy with Step CA..."
-	mkdir .build
-	git clone --branch $(VERSION) --depth 1 $(UPSTREAM) .build/certificates/
-	rm -rf .build/certificates/server && cp -r ./hack/server .build/certificates/server
 	mkdir db
-	go build -v -o $(APP_NAME) .
+	go build -ldflags="-s -w" -v -o $(APP_NAME) .
 	@echo "✅ Done"

go.mod

@@ -2,17 +2,10 @@ module github.com/esnet/acme-proxy
 
 go 1.25.0
 
-// The root cause of the bug appears to be caused by short `WriteTimeout` value
-// which is currently hardcoded to 15 seconds in the upstream repository
-// https://github.com/smallstep/certificates/blob/master/server/server.go#L45
-// Our workaround simply bumps up the timeout from 15s to 90s.
-// There is already a pull request for a permanent fix but it remains to be merged
-// See https://github.com/smallstep/certificates/pull/1643/files
-replace github.com/smallstep/certificates => ./.build/certificates
+replace github.com/smallstep/certificates => github.com/esnet/certificates v0.30.2-patch.2
 
 require (
 	github.com/go-acme/lego/v4 v4.33.0
-	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.23.2
 	github.com/smallstep/certificates v0.30.2
 	github.com/smallstep/cli-utils v0.12.2
@@ -136,6 +129,7 @@ require (
 	github.com/newrelic/go-agent/v3 v3.42.0 // indirect
 	github.com/peterbourgon/diskv/v3 v3.0.1 // indirect
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.67.5 // indirect
 	github.com/prometheus/procfs v0.19.2 // indirect

go.sum

@@ -143,6 +143,8 @@ github.com/envoyproxy/go-control-plane/envoy v1.36.0 h1:yg/JjO5E7ubRyKX3m07GF3re
 github.com/envoyproxy/go-control-plane/envoy v1.36.0/go.mod h1:ty89S1YCCVruQAm9OtKeEkQLTb+Lkz0k8v9W0Oxsv98=
 github.com/envoyproxy/protoc-gen-validate v1.3.0 h1:TvGH1wof4H33rezVKWSpqKz5NXWg5VPuZ0uONDT6eb4=
 github.com/envoyproxy/protoc-gen-validate v1.3.0/go.mod h1:HvYl7zwPa5mffgyeTUHA9zHIH36nmrm7oCbo4YKoSWA=
+github.com/esnet/certificates v0.30.2-patch.2 h1:k4+zeuvqetGdYQHgEfeF6HdUDfNEAkT+BsGKdkx7DZk=
+github.com/esnet/certificates v0.30.2-patch.2/go.mod h1:oyaE/aEYUGDr+YiCZLAxxP22bOQqcSHTeDgp8Vv2rlY=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=