From 16082b038b8967517d456c32d44876d9999e1363 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 9 Feb 2023 01:20:24 +0000 Subject: [PATCH] Bump Caddy version --- 2.6/alpine/Dockerfile | 37 +++++++++++++++++++++++++++++++++++++ README.md | 6 +++--- 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 2.6/alpine/Dockerfile diff --git a/2.6/alpine/Dockerfile b/2.6/alpine/Dockerfile new file mode 100644 index 0000000..9f41959 --- /dev/null +++ b/2.6/alpine/Dockerfile @@ -0,0 +1,37 @@ +FROM caddy:2.6.3-alpine as build + +RUN apk add --no-cache upx ca-certificates \ + && upx --ultra-brute /usr/bin/caddy \ + && caddy version + +FROM scratch + +COPY --from=build /etc/caddy/Caddyfile /etc/caddy/Caddyfile +COPY --from=build /usr/share/caddy/index.html /usr/share/caddy/index.html +COPY --from=build /usr/bin/caddy /usr/bin/caddy +COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt +COPY --from=build /etc/nsswitch.conf /etc/nsswitch.conf + +ENV XDG_CONFIG_HOME=/config +ENV XDG_DATA_HOME=/data +ENV HOME=/ + +VOLUME /config +VOLUME /data + +LABEL org.opencontainers.image.version=v2.6.3 +LABEL org.opencontainers.image.title="Caddy (productionwentdown build)" +LABEL org.opencontainers.image.description="a powerful, enterprise-ready, open source web server with automatic HTTPS written in Go" +LABEL org.opencontainers.image.url=https://productionwentdown.makerforce.io +LABEL org.opencontainers.image.documentation=https://caddyserver.com/docs +LABEL org.opencontainers.image.vendor="productionwentdown" +LABEL org.opencontainers.image.licenses=Apache-2.0 +LABEL org.opencontainers.image.source="https://github.com/productionwentdown/caddy" + +EXPOSE 80 +EXPOSE 443 +EXPOSE 2019 + +WORKDIR /srv + +CMD ["/usr/bin/caddy", "run", "--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"] diff --git a/README.md b/README.md index dd10af6..b29cc30 100755 --- a/README.md +++ b/README.md @@ -10,12 +10,12 @@ A tiny <10MB Caddy image compressed with [UPX](https://github.com/upx/upx). New versions are tracked within 4 hours. Currently available versions: -* `2.4.6-alpine`, `2-alpine`, `alpine` +* `2.6.3-alpine`, `2.6-alpine`, `2-alpine`, `alpine` ## Shared Tags -* `2.4.6`, `2`, `latest` - * `2.4.6-alpine` +* `2.6.3`, `2.6`, `2`, `latest` + * `2.6.3-alpine` # Usage