Skip to content

update to 1.0.4 #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

update to 1.0.4 #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
150dea8
Update golang Docker Image to 1.13
Jacobite89 Nov 18, 2019
4b28104
Update Caddy to 1.0.4
Jacobite89 Nov 18, 2019
f10e9b4
Update Caddy to 1.0.4
Jacobite89 Nov 18, 2019
fec77fd
Update Caddy to 1.0.4
Jacobite89 Nov 18, 2019
0c8bebc
update to 1.0.4
Jacobite89 Nov 18, 2019
145a36c
Update Caddy to 1.0.4
Jacobite89 Nov 18, 2019
7e13085
Update Caddy to 1.0.4
Jacobite89 Nov 18, 2019
0bba115
update to 1.0.4
Jacobite89 Nov 18, 2019
91d207e
remove debug symbols from build + make static build
Jacobite89 Nov 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BUILDER.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ 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 `1.0.4`
- `ENABLE_TELEMETRY` - Enable telemetry stats. Options `true`|`false`. Default `true`
- `GOOS`, `GOARCH` and `GOARM` are all supported. Default `GOOS=linux`, `GOARCH=amd64`
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
FROM abiosoft/caddy:builder as builder

ARG version="1.0.3"
ARG version="1.0.4"
ARG plugins="git,cors,realip,expires,cache,cloudflare"
ARG enable_telemetry="true"

Expand All @@ -18,7 +18,7 @@ RUN VERSION=${version} PLUGINS=${plugins} ENABLE_TELEMETRY=${enable_telemetry} /
FROM alpine:3.10
LABEL maintainer "Abiola Ibrahim <[email protected]>"

ARG version="1.0.3"
ARG version="1.0.4"
LABEL caddy_version="$version"

# Let's Encrypt Agreement
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-no-stats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
FROM abiosoft/caddy:builder as builder

ARG version="1.0.3"
ARG version="1.0.4"
ARG plugins="git,cors,realip,expires,cache,cloudflare"

# process wrapper
Expand All @@ -17,7 +17,7 @@ RUN VERSION=${version} PLUGINS=${plugins} ENABLE_TELEMETRY=false /bin/sh /usr/bi
FROM alpine:3.10
LABEL maintainer "Abiola Ibrahim <[email protected]>"

ARG version="1.0.3"
ARG version="1.0.4"
LABEL caddy_version="$version"

# Let's Encrypt Agreement
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-1.0.4-blue.svg)](https://github.com/caddyserver/caddy/tree/v1.0.4)

Check [abiosoft/caddy:builder](https://github.com/abiosoft/caddy-docker/blob/master/BUILDER.md) for generating cross-platform Caddy binaries.

Expand Down
2 changes: 1 addition & 1 deletion builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12-alpine
FROM golang:1.13-alpine

RUN apk add --no-cache git gcc musl-dev

Expand Down
8 changes: 4 additions & 4 deletions builder/builder.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

VERSION=${VERSION:-"1.0.3"}
VERSION=${VERSION:-"1.0.4"}
TELEMETRY=${ENABLE_TELEMETRY:-"true"}
IMPORT="github.com/caddyserver/caddy"

Expand Down Expand Up @@ -42,7 +42,7 @@ get_package() {
cp -r /dnsproviders/$1/$1.go /caddy/dnsproviders/$1/$1.go
echo "caddy/dnsproviders/$1"
else
GO111MODULE=off GOOS=linux GOARCH=amd64 caddyplug package $1 2> /dev/null
GO111MODULE=off caddyplug package $1 2> /dev/null
fi
}

Expand Down Expand Up @@ -131,7 +131,7 @@ end_stage

# plugin helper
stage "installing plugin helper"
GOOS=linux GOARCH=amd64 go get -v github.com/abiosoft/caddyplug/caddyplug
go get -v github.com/abiosoft/caddyplug/caddyplug
end_stage

# check for modules support
Expand All @@ -155,7 +155,7 @@ end_stage

# build
stage "building caddy"
CGO_ENABLED=0 go build -o caddy
CGO_ENABLED=0 go build -ldflags '-w -s -extldflags "-static"' -o caddy
end_stage

# copy binary
Expand Down
4 changes: 2 additions & 2 deletions php/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
FROM abiosoft/caddy:builder as builder

ARG version="1.0.3"
ARG version="1.0.4"
ARG plugins="git,cors,realip,expires,cache,cloudflare"
ARG enable_telemetry="true"

Expand All @@ -18,7 +18,7 @@ RUN VERSION=${version} PLUGINS=${plugins} ENABLE_TELEMETRY=${enable_telemetry} /
FROM alpine:3.10
LABEL maintainer "Abiola Ibrahim <[email protected]>"

ARG version="1.0.3"
ARG version="1.0.4"
LABEL caddy_version="$version"

# PHP www-user UID and GID
Expand Down
4 changes: 2 additions & 2 deletions php/Dockerfile-no-stats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
FROM abiosoft/caddy:builder as builder

ARG version="1.0.3"
ARG version="1.0.4"
ARG plugins="git,cors,realip,expires,cache,cloudflare"

# Process Wrapper
Expand All @@ -17,7 +17,7 @@ RUN VERSION=${version} PLUGINS=${plugins} ENABLE_TELEMETRY=false /bin/sh /usr/bi
FROM alpine:3.10
LABEL maintainer "Abiola Ibrahim <[email protected]>"

ARG version="1.0.3"
ARG version="1.0.4"
LABEL caddy_version="$version"

# PHP www-user UID and GID
Expand Down