Skip to content

Commit b198353

Browse files
committed
v2.6.4: go1.20.1, Caddy v2.6.4
1 parent 0b1c4d8 commit b198353

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM golang:1.20 AS builder
1+
FROM golang:1.20.1 AS builder
22
RUN mkdir /build
33
WORKDIR /build
44
RUN go install github.com/caddyserver/xcaddy/cmd/[email protected]
5-
RUN GOOS=linux GOARCH=amd64 xcaddy build v2.6.3
5+
RUN GOOS=linux GOARCH=amd64 xcaddy build v2.6.4
66

77
FROM scratch
88
LABEL maintainer="Josh Wood <[email protected]>"
9-
LABEL caddy_version="2.6.3"
9+
LABEL caddy_version="2.6.4"
1010
COPY rootfs /
1111
COPY --from=builder /build/caddy /bin/caddy
1212
USER 65534:65534

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Caddy can [automatically acquire and renew TLS keys and certificates][caddyautot
107107

108108
Versions up to v2.6.2-cb.1 included a caddy binary built outside the container build process. While that is no longer true, and caddy is built in a multi-stage container build, this repo remains large with every previous version having a binary at `rootfs/bin/caddy`.
109109

110-
Work around this with git's shallow clone. This fetches only the given number of revisions. For most new clones of this repo, that number should be 1. Something like `git clone --depth 1 --branch multistage https://github.com/joshix/caddybox` should require only a small download and disk allocation.
110+
Work around this with git's shallow clone. This fetches only the given number of revisions. For most new clones of this repo, that number should be 1. Something like `git clone --depth 1 https://github.com/joshix/caddybox` should require only a small download and disk allocation.
111111

112112
## Building Caddy with xcaddy
113113

@@ -117,7 +117,7 @@ Preserved for reference. The build is no longer done out-of-band and the caddy b
117117

118118
```sh
119119
cd /tmp/caddyboxbuild
120-
GOOS=linux GOARCH=amd64 xcaddy build v2.6.3
120+
GOOS=linux GOARCH=amd64 xcaddy build v2.6.4
121121
file caddy
122122
cp caddy [...]/caddybox/rootfs/bin/caddy
123123
```

0 commit comments

Comments
 (0)