Build and dependency updates

- Use Go 1.21 for builds
- Use caddy 2.7.5 for xbuilds

.github/dependabot.yml

@@ -4,8 +4,7 @@ updates:
   - directory: /
     package-ecosystem: github-actions
     schedule:
-      interval: monthly
-      day: saturday
+      interval: weekly
     commit-message:
       prefix: ci
     labels:
@@ -14,19 +13,29 @@ updates:
   - directory: /
     package-ecosystem: gomod
     schedule:
-      interval: monthly
-      day: saturday
+      interval: weekly
     commit-message:
       prefix: build(go)
     labels:
       - dependencies
+    groups:
+      caddy:
+        patterns:
+          - "*caddy*"
+        update-types:
+          - "minor"
   # Update Docker base images
   - directory: /
     package-ecosystem: docker
     schedule:
-      interval: monthly
-      day: saturday
+      interval: weekly
     commit-message:
       prefix: build(docker)
     labels:
-      - dependencies
+      - dependencies
+    groups:
+      caddy:
+        patterns:
+          - "caddy*"
+        update-types:
+          - "minor"

.github/workflows/release.yml

@@ -43,16 +43,13 @@ jobs:
       with:
         images: ghcr.io/${{ github.repository }}
         tags: |
-          ${{ steps.get_tag.outputs.TAG }}-caddy-${{ env.CADDY_VERSION }},
+          ${{ steps.get_tag.outputs.TAG }}-caddy-${{ env.CADDY_VERSION }}
           ${{ steps.get_tag.outputs.TAG }}
           latest
 
     - name: Build and push
       uses: docker/build-push-action@v5
       with:
-        build-args: |
-          CADDY_VERSION=${{ env.CADDY_VERSION }}
-          TAG=${{ steps.get_tag.outputs.TAG }}
         context: .
         push: true
         tags: ${{ steps.meta.outputs.tags }}

Dockerfile

@@ -1,14 +1,12 @@
-ARG CADDY_VERSION
-ARG TAG
-
-FROM caddy:${CADDY_VERSION}-builder-alpine AS builder
-
-ARG TAG
-ENV TAG ${TAG}
+FROM caddy:2.7.5-builder-alpine AS builder
 
 RUN xcaddy build \
-    --with github.com/Elegant996/scgi-transport@v${TAG}
+    --with github.com/Elegant996/scgi-transport@v1.0.3
+
+FROM caddy:2.7.5-alpine
 
-FROM caddy:${CADDY_VERSION}-alpine
+COPY --from=builder /usr/bin/caddy /usr/bin/caddy
 
-COPY --from=builder /usr/bin/caddy /usr/bin/caddy
+LABEL org.opencontainers.image.source="https://github.com/Elegant996/scgi-transport"
+LABEL org.opencontainers.image.description="SCGI reverse proxy transport module for Caddy"
+LABEL org.opencontainers.image.licenses="Apache-2.0"

README.md

@@ -50,7 +50,7 @@ Docker
 You may download a pre-compiled version of `caddy` embedded with this module through the GitHub Container Registry using any of the below:
 
 ```
-docker pull ghcr.io/elegant996/scgi-transport:1.0.2-caddy-2.7.4
-docker pull ghcr.io/elegant996/scgi-transport:1.0.2
+docker pull ghcr.io/elegant996/scgi-transport:1.0.3-caddy-2.7.5
+docker pull ghcr.io/elegant996/scgi-transport:1.0.3
 docker pull ghcr.io/elegant996/scgi-transport:latest
 ```

go.mod

@@ -1,15 +1,13 @@
 module github.com/Elegant996/scgi-transport
 
-go 1.20
+go 1.21
 
 require (
 	github.com/caddyserver/caddy/v2 v2.7.5
 	go.uber.org/zap v1.26.0
 )
 
 require (
-	cloud.google.com/go/compute v1.23.0 // indirect
-	cloud.google.com/go/iam v1.1.1 // indirect
 	filippo.io/edwards25519 v1.0.0 // indirect
 	github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
@@ -35,7 +33,6 @@ require (
 	github.com/go-sql-driver/mysql v1.7.1 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/golang/glog v1.1.2 // indirect
-	github.com/golang/mock v1.6.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/cel-go v0.17.1 // indirect
@@ -52,7 +49,7 @@ require (
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
 	github.com/jackc/pgtype v1.14.0 // indirect
 	github.com/jackc/pgx/v4 v4.18.1 // indirect
-	github.com/klauspost/compress v1.16.7 // indirect
+	github.com/klauspost/compress v1.17.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/libdns/libdns v0.2.1 // indirect
 	github.com/manifoldco/promptui v0.9.0 // indirect
@@ -74,13 +71,13 @@ require (
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.11.1 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
-	github.com/quic-go/qtls-go1-20 v0.3.2 // indirect
-	github.com/quic-go/quic-go v0.38.0 // indirect
+	github.com/quic-go/qtls-go1-20 v0.3.4 // indirect
+	github.com/quic-go/quic-go v0.39.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
 	github.com/slackhq/nebula v1.7.2 // indirect
-	github.com/smallstep/certificates v0.24.3-rc1 // indirect
+	github.com/smallstep/certificates v0.25.0 // indirect
 	github.com/smallstep/nosql v0.6.0 // indirect
 	github.com/smallstep/truststore v0.12.1 // indirect
 	github.com/spf13/cast v1.5.1 // indirect
@@ -93,20 +90,21 @@ require (
 	go.etcd.io/bbolt v1.3.7 // indirect
 	go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
 	go.step.sm/cli-utils v0.8.0 // indirect
-	go.step.sm/crypto v0.35.0 // indirect
-	go.step.sm/linkedca v0.20.0 // indirect
+	go.step.sm/crypto v0.35.1 // indirect
+	go.step.sm/linkedca v0.20.1 // indirect
+	go.uber.org/mock v0.3.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.12.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
 	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
 	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/net v0.14.0 // indirect
-	golang.org/x/sys v0.11.0 // indirect
-	golang.org/x/term v0.11.0 // indirect
-	golang.org/x/text v0.12.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/tools v0.12.1-0.20230821203513-6eca6dfbb247 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230821184602-ccc8af3d0e93 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230821184602-ccc8af3d0e93 // indirect
-	google.golang.org/grpc v1.57.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
+	google.golang.org/grpc v1.58.2 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect