Skip to content
This repository was archived by the owner on Dec 2, 2017. It is now read-only.

Commit a2e976b

Browse files
sapkbkcsoft
authored andcommitted
Build caddy with plugins via multi-stage (#121)
* build caddy with plugins via multi-stage * drone sig Signed-off-by: Kim "BKC" Carlbäcker <[email protected]>
1 parent 2f16354 commit a2e976b

File tree

3 files changed

+19
-11
lines changed

3 files changed

+19
-11
lines changed

.drone.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ pipeline:
1313

1414
docker:
1515
image: plugins/docker
16+
pull: true
1617
repo: gitea/docs
1718
tags: [ '${DRONE_BRANCH##release/v}' ]
1819
when:
@@ -21,6 +22,7 @@ pipeline:
2122

2223
docker:
2324
image: plugins/docker
25+
pull: true
2426
repo: gitea/docs
2527
tags: [ 'latest' ]
2628
when:

.drone.yml.sig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIHBhdGg6IHNyYwoKcGlwZWxpbmU6CiAgYnVpbGQ6CiAgICBpbWFnZTogd2ViaGlwcGllL2h1Z286bGF0ZXN0CiAgICBwdWxsOiB0cnVlCiAgICBjb21tYW5kczoKICAgICAgLSBtYWtlIHRyYW5zLWNvcHkKCiAgICAgIC0gbWFrZSBjbGVhbgogICAgICAtIG1ha2UgYnVpbGQKCiAgZG9ja2VyOgogICAgaW1hZ2U6IHBsdWdpbnMvZG9ja2VyCiAgICByZXBvOiBnaXRlYS9kb2NzCiAgICB0YWdzOiBbICcke0RST05FX0JSQU5DSCMjcmVsZWFzZS92fScgXQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCiAgICAgIGJyYW5jaDogWyByZWxlYXNlLyogXQoKICBkb2NrZXI6CiAgICBpbWFnZTogcGx1Z2lucy9kb2NrZXIKICAgIHJlcG86IGdpdGVhL2RvY3MKICAgIHRhZ3M6IFsgJ2xhdGVzdCcgXQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCiAgICAgIGJyYW5jaDogWyBtYXN0ZXIgXQoKICBnaXR0ZXI6CiAgICBpbWFnZTogcGx1Z2lucy9naXR0ZXIK.RPW5ozTUJwd47a23CY34doKDRgcm0DitJ-T5qH61Z-Q
1+
eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIHBhdGg6IHNyYwoKcGlwZWxpbmU6CiAgYnVpbGQ6CiAgICBpbWFnZTogd2ViaGlwcGllL2h1Z286bGF0ZXN0CiAgICBwdWxsOiB0cnVlCiAgICBjb21tYW5kczoKICAgICAgLSBtYWtlIHRyYW5zLWNvcHkKCiAgICAgIC0gbWFrZSBjbGVhbgogICAgICAtIG1ha2UgYnVpbGQKCiAgZG9ja2VyOgogICAgaW1hZ2U6IHBsdWdpbnMvZG9ja2VyCiAgICBwdWxsOiB0cnVlCiAgICByZXBvOiBnaXRlYS9kb2NzCiAgICB0YWdzOiBbICcke0RST05FX0JSQU5DSCMjcmVsZWFzZS92fScgXQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCiAgICAgIGJyYW5jaDogWyByZWxlYXNlLyogXQoKICBkb2NrZXI6CiAgICBpbWFnZTogcGx1Z2lucy9kb2NrZXIKICAgIHB1bGw6IHRydWUKICAgIHJlcG86IGdpdGVhL2RvY3MKICAgIHRhZ3M6IFsgJ2xhdGVzdCcgXQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCiAgICAgIGJyYW5jaDogWyBtYXN0ZXIgXQoKICBnaXR0ZXI6CiAgICBpbWFnZTogcGx1Z2lucy9naXR0ZXIK.-yyNQtRepINu0L0utwOeqe2kg71H4bGMaav5lWOz8-U

Dockerfile

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1+
# build stage
2+
FROM golang:alpine AS build-env
3+
4+
RUN apk add --no-cache git
5+
RUN go get -d -v github.com/mholt/caddy/caddy github.com/pedronasser/caddy-search github.com/simia-tech/caddy-locale
6+
WORKDIR /go/src/github.com/mholt/caddy/caddy
7+
8+
RUN sed -i '/This is where other plugins get plugged in (imported)/a _ "github.com/pedronasser/caddy-search"' caddymain/run.go \
9+
&& sed -i '/This is where other plugins get plugged in (imported)/a _ "github.com/simia-tech/caddy-locale"' caddymain/run.go \
10+
&& go install -v . \
11+
&& /go/bin/caddy -version
12+
113
FROM alpine:edge
214
EXPOSE 80
315

4-
RUN apk update && \
5-
apk add wget mailcap ca-certificates && \
6-
rm -rf /var/cache/apk/* && \
7-
wget -O /tmp/caddy.tar.gz "https://caddyserver.com/download/build?os=linux&arch=amd64&features=locale%2Csearch" && \
8-
mkdir -p /tmp/caddy && \
9-
tar xvzf /tmp/caddy.tar.gz -C /tmp/caddy && \
10-
cp /tmp/caddy/caddy /usr/sbin/caddy && \
11-
rm -rf /tmp/caddy*
12-
13-
CMD ["/usr/sbin/caddy", "-conf", "/etc/caddy.conf"]
16+
RUN apk add --no-cache wget mailcap ca-certificates
17+
COPY --from=build-env /go/bin/caddy /usr/sbin/caddy
1418

1519
COPY docker/caddy.conf /etc/caddy.conf
1620
COPY public /srv/www
21+
22+
CMD ["/usr/sbin/caddy", "-conf", "/etc/caddy.conf"]

0 commit comments

Comments
 (0)