From 43a2b54a6f6875a02135e9696dc4b0591dbd014d Mon Sep 17 00:00:00 2001 From: Paul Jordan Date: Sun, 10 Mar 2019 21:27:51 +0000 Subject: [PATCH 1/6] Update to build on arm --- Dockerfile | 2 +- builder/builder.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5faf6a10..710db0b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # # Builder # -FROM abiosoft/caddy:builder as builder +FROM paullj1/caddy-arm:builder as builder ARG version="0.11.5" ARG plugins="git,filebrowser,cors,realip,expires,cache" diff --git a/builder/builder.sh b/builder/builder.sh index 20365d8e..7c010b7c 100644 --- a/builder/builder.sh +++ b/builder/builder.sh @@ -9,8 +9,8 @@ git clone https://github.com/mholt/caddy -b "v$VERSION" /go/src/github.com/mholt && git checkout -b "v$VERSION" # plugin helper -GOOS=linux GOARCH=amd64 go get -v github.com/abiosoft/caddyplug/caddyplug -alias caddyplug='GOOS=linux GOARCH=amd64 caddyplug' +GOOS=linux GOARCH=arm GOARM=5 go get -v github.com/abiosoft/caddyplug/caddyplug +alias caddyplug='GOOS=linux GOARCH=arm GOARM=5 caddyplug' # telemetry run_file="/go/src/github.com/mholt/caddy/caddy/caddymain/run.go" @@ -41,7 +41,7 @@ git clone https://github.com/caddyserver/builds /go/src/github.com/caddyserver/b # build cd /go/src/github.com/mholt/caddy/caddy \ - && GOOS=linux GOARCH=amd64 go run build.go -goos=$GOOS -goarch=$GOARCH -goarm=$GOARM \ + && GOOS=linux GOARCH=arm GOARM=5 go run build.go -goos=$GOOS -goarch=$GOARCH -goarm=$GOARM \ && mkdir -p /install \ && mv caddy /install From 3aaf816fddfa8626fcd396e15f107cab0dfb3de6 Mon Sep 17 00:00:00 2001 From: Paul Jordan Date: Mon, 16 Sep 2019 07:08:00 -0500 Subject: [PATCH 2/6] Working on cross-platform builder --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0f489f64..b4980297 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # # Builder # -FROM paullj1/caddy-arm:builder as builder +FROM abiosoft/caddy:builder as builder ARG version="1.0.3" ARG plugins="git,cors,realip,expires,cache,cloudflare" From 70fb5f810362961b6da58119a668a3ca31620c9f Mon Sep 17 00:00:00 2001 From: Paul Jordan Date: Mon, 16 Sep 2019 11:59:42 -0500 Subject: [PATCH 3/6] Add buildkit definition file --- BUILDER.md | 3 ++- builder/builder.sh | 2 +- docker-bake.hcl | 24 ++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 docker-bake.hcl diff --git a/BUILDER.md b/BUILDER.md index b8d4a8c8..6173a3b2 100644 --- a/BUILDER.md +++ b/BUILDER.md @@ -20,4 +20,5 @@ docker run --rm -v $(pwd):/install -e PLUGINS=git,filebrowser abiosoft/caddy:bui - `PLUGINS` - comma separated Caddy plugins. e.g. `-e PLUGINS=git,linode` - `VERSION` - Caddy version or repository branch. Default `1.0.3` - `ENABLE_TELEMETRY` - Enable telemetry stats. Options `true`|`false`. Default `true` -- `GOOS`, `GOARCH` and `GOARM` are all supported. Default `GOOS=linux`, `GOARCH=amd64` +- `GOOS`, `GOARCH` and `GOARM` are all supported, but buildkit is the new way + to specify architecture diff --git a/builder/builder.sh b/builder/builder.sh index 3ab339f7..c0c9e3e4 100644 --- a/builder/builder.sh +++ b/builder/builder.sh @@ -131,7 +131,7 @@ end_stage # plugin helper stage "installing plugin helper" -GOOS=linux GOARCH=amd64 go get -v github.com/abiosoft/caddyplug/caddyplug +GOOS=linux go get -v github.com/abiosoft/caddyplug/caddyplug end_stage # check for modules support diff --git a/docker-bake.hcl b/docker-bake.hcl new file mode 100644 index 00000000..454b7221 --- /dev/null +++ b/docker-bake.hcl @@ -0,0 +1,24 @@ + +group "default" { + targets = ["caddy", "builder"] +} + +target "caddy" { + context = "./" + dockerfile = "Dockerfile" + output = ["type=registry"] + driver = "docker-container" + tags = ["docker.io/abiosoft/caddy-docker:latest", + "docker.io/abiosoft/caddy-docker:" ] + platforms = ["linux/amd64", "linux/arm64", "linux/arm/v6", "linux/arm/v7"] +} + +target "builder" { + context = "./builder/" + dockerfile = "Dockerfile" + output = ["type=registry"] + driver = "docker-container" + tags = ["docker.io/abiosoft/caddy-docker:latest"] + platforms = ["linux/amd64", "linux/arm64", "linux/arm/v6", "linux/arm/v7"] +} + From 7862220fc99988fa5bf3f8a947ebbd1c54b8ff12 Mon Sep 17 00:00:00 2001 From: Paul Jordan Date: Mon, 16 Sep 2019 14:42:38 -0500 Subject: [PATCH 4/6] Add current version to tag --- docker-bake.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 454b7221..277b4944 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -9,7 +9,7 @@ target "caddy" { output = ["type=registry"] driver = "docker-container" tags = ["docker.io/abiosoft/caddy-docker:latest", - "docker.io/abiosoft/caddy-docker:" ] + "docker.io/abiosoft/caddy-docker:1.0.3" ] platforms = ["linux/amd64", "linux/arm64", "linux/arm/v6", "linux/arm/v7"] } From 4c4f1fdd9d5d07be6747a4bc82cd6e45a3d1a8a8 Mon Sep 17 00:00:00 2001 From: Paul Jordan Date: Mon, 16 Sep 2019 14:49:48 -0500 Subject: [PATCH 5/6] Use correct repo name --- docker-bake.hcl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 277b4944..1b527d59 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -8,8 +8,8 @@ target "caddy" { dockerfile = "Dockerfile" output = ["type=registry"] driver = "docker-container" - tags = ["docker.io/abiosoft/caddy-docker:latest", - "docker.io/abiosoft/caddy-docker:1.0.3" ] + tags = ["docker.io/abiosoft/caddy:latest", + "docker.io/abiosoft/caddy:1.0.3" ] platforms = ["linux/amd64", "linux/arm64", "linux/arm/v6", "linux/arm/v7"] } @@ -18,7 +18,7 @@ target "builder" { dockerfile = "Dockerfile" output = ["type=registry"] driver = "docker-container" - tags = ["docker.io/abiosoft/caddy-docker:latest"] + tags = ["docker.io/abiosoft/caddy:builder"] platforms = ["linux/amd64", "linux/arm64", "linux/arm/v6", "linux/arm/v7"] } From 078cae41eeb5d3dd84ef17df5868928fad978ebf Mon Sep 17 00:00:00 2001 From: Paul Jordan Date: Tue, 5 May 2020 07:40:53 -0400 Subject: [PATCH 6/6] Roll to v2 --- BUILDER.md | 2 +- Dockerfile | 8 ++++---- Dockerfile-no-stats | 6 +++--- README.md | 2 +- builder/builder.sh | 2 +- docker-bake.hcl | 10 +++++----- php/Dockerfile | 6 +++--- php/Dockerfile-no-stats | 6 +++--- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/BUILDER.md b/BUILDER.md index 6173a3b2..1e15a6c6 100644 --- a/BUILDER.md +++ b/BUILDER.md @@ -18,7 +18,7 @@ docker run --rm -v $(pwd):/install -e PLUGINS=git,filebrowser abiosoft/caddy:bui ### Environment Variables - `PLUGINS` - comma separated Caddy plugins. e.g. `-e PLUGINS=git,linode` -- `VERSION` - Caddy version or repository branch. Default `1.0.3` +- `VERSION` - Caddy version or repository branch. Default `2.0.0` - `ENABLE_TELEMETRY` - Enable telemetry stats. Options `true`|`false`. Default `true` - `GOOS`, `GOARCH` and `GOARM` are all supported, but buildkit is the new way to specify architecture diff --git a/Dockerfile b/Dockerfile index b4980297..38a8c2e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ # # Builder # -FROM abiosoft/caddy:builder as builder +FROM paullj1/caddy:builder as builder -ARG version="1.0.3" +ARG version="2.0.0" ARG plugins="git,cors,realip,expires,cache,cloudflare" ARG enable_telemetry="true" @@ -15,10 +15,10 @@ RUN VERSION=${version} PLUGINS=${plugins} ENABLE_TELEMETRY=${enable_telemetry} / # # Final stage # -FROM alpine:3.10 +FROM alpine:3.11 LABEL maintainer "Abiola Ibrahim " -ARG version="1.0.3" +ARG version="2.0.0" LABEL caddy_version="$version" # Let's Encrypt Agreement diff --git a/Dockerfile-no-stats b/Dockerfile-no-stats index f45251ff..908eb9c9 100644 --- a/Dockerfile-no-stats +++ b/Dockerfile-no-stats @@ -3,7 +3,7 @@ # FROM abiosoft/caddy:builder as builder -ARG version="1.0.3" +ARG version="2.0.0" ARG plugins="git,cors,realip,expires,cache,cloudflare" # process wrapper @@ -14,10 +14,10 @@ RUN VERSION=${version} PLUGINS=${plugins} ENABLE_TELEMETRY=false /bin/sh /usr/bi # # Final stage # -FROM alpine:3.10 +FROM alpine:3.11 LABEL maintainer "Abiola Ibrahim " -ARG version="1.0.3" +ARG version="2.0.0" LABEL caddy_version="$version" # Let's Encrypt Agreement diff --git a/README.md b/README.md index 218efa4f..6528491f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ A [Docker](https://docker.com) image for [Caddy](https://caddyserver.com). This Plugins can be configured via the [`plugins` build arg](#custom-plugins). [![](https://images.microbadger.com/badges/image/abiosoft/caddy.svg)](https://microbadger.com/images/abiosoft/caddy "Get your own image badge on microbadger.com") -[![](https://img.shields.io/badge/version-1.0.3-blue.svg)](https://github.com/caddyserver/caddy/tree/v1.0.3) +[![](https://img.shields.io/badge/version-2.0.0-blue.svg)](https://github.com/caddyserver/caddy/tree/v2.0.0) Check [abiosoft/caddy:builder](https://github.com/abiosoft/caddy-docker/blob/master/BUILDER.md) for generating cross-platform Caddy binaries. diff --git a/builder/builder.sh b/builder/builder.sh index c0c9e3e4..c8018dbe 100644 --- a/builder/builder.sh +++ b/builder/builder.sh @@ -1,6 +1,6 @@ #!/bin/sh -VERSION=${VERSION:-"1.0.3"} +VERSION=${VERSION:-"2.0.0"} TELEMETRY=${ENABLE_TELEMETRY:-"true"} IMPORT="github.com/caddyserver/caddy" diff --git a/docker-bake.hcl b/docker-bake.hcl index 1b527d59..957ffe82 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -8,9 +8,9 @@ target "caddy" { dockerfile = "Dockerfile" output = ["type=registry"] driver = "docker-container" - tags = ["docker.io/abiosoft/caddy:latest", - "docker.io/abiosoft/caddy:1.0.3" ] - platforms = ["linux/amd64", "linux/arm64", "linux/arm/v6", "linux/arm/v7"] + tags = ["docker.io/paullj1/caddy:latest", + "docker.io/paullj1/caddy:2.0.0" ] + platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7"] } target "builder" { @@ -18,7 +18,7 @@ target "builder" { dockerfile = "Dockerfile" output = ["type=registry"] driver = "docker-container" - tags = ["docker.io/abiosoft/caddy:builder"] - platforms = ["linux/amd64", "linux/arm64", "linux/arm/v6", "linux/arm/v7"] + tags = ["docker.io/paullj1/caddy:builder"] + platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7"] } diff --git a/php/Dockerfile b/php/Dockerfile index 5c2935c3..a73e8b76 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -3,7 +3,7 @@ # FROM abiosoft/caddy:builder as builder -ARG version="1.0.3" +ARG version="2.0.0" ARG plugins="git,cors,realip,expires,cache,cloudflare" ARG enable_telemetry="true" @@ -15,10 +15,10 @@ RUN VERSION=${version} PLUGINS=${plugins} ENABLE_TELEMETRY=${enable_telemetry} / # # Final Stage # -FROM alpine:3.10 +FROM alpine:3.11 LABEL maintainer "Abiola Ibrahim " -ARG version="1.0.3" +ARG version="2.0.0" LABEL caddy_version="$version" # PHP www-user UID and GID diff --git a/php/Dockerfile-no-stats b/php/Dockerfile-no-stats index e81b3725..1b6f7435 100644 --- a/php/Dockerfile-no-stats +++ b/php/Dockerfile-no-stats @@ -3,7 +3,7 @@ # FROM abiosoft/caddy:builder as builder -ARG version="1.0.3" +ARG version="2.0.0" ARG plugins="git,cors,realip,expires,cache,cloudflare" # Process Wrapper @@ -14,10 +14,10 @@ RUN VERSION=${version} PLUGINS=${plugins} ENABLE_TELEMETRY=false /bin/sh /usr/bi # # Final Stage # -FROM alpine:3.10 +FROM alpine:3.11 LABEL maintainer "Abiola Ibrahim " -ARG version="1.0.3" +ARG version="2.0.0" LABEL caddy_version="$version" # PHP www-user UID and GID