From 0fc3bd13d732f5eef98e9617cf9887a786a07663 Mon Sep 17 00:00:00 2001 From: Antoine GIRARD Date: Mon, 5 Jun 2017 18:36:21 +0200 Subject: [PATCH 1/3] build caddy with plugins via multi-stage same as go-gitea/website#43 --- Dockerfile | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 29df5ab..c69a921 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,22 @@ +# build stage +FROM golang:alpine AS build-env + +RUN apk add --no-cache git +RUN go get -d -v github.com/mholt/caddy/caddy github.com/pedronasser/caddy-search github.com/simia-tech/caddy-locale +WORKDIR /go/src/github.com/mholt/caddy/caddy + +RUN sed -i '/This is where other plugins get plugged in (imported)/a _ "github.com/pedronasser/caddy-search"' caddymain/run.go \ + && sed -i '/This is where other plugins get plugged in (imported)/a _ "github.com/simia-tech/caddy-locale"' caddymain/run.go \ + && go install -v . \ + && /go/bin/caddy -version + FROM alpine:edge EXPOSE 80 -RUN apk update && \ - apk add wget mailcap ca-certificates && \ - rm -rf /var/cache/apk/* && \ - wget -O /tmp/caddy.tar.gz "https://caddyserver.com/download/build?os=linux&arch=amd64&features=locale%2Csearch" && \ - mkdir -p /tmp/caddy && \ - tar xvzf /tmp/caddy.tar.gz -C /tmp/caddy && \ - cp /tmp/caddy/caddy /usr/sbin/caddy && \ - rm -rf /tmp/caddy* - -CMD ["/usr/sbin/caddy", "-conf", "/etc/caddy.conf"] +RUN apk add --no-cache wget mailcap ca-certificates +COPY --from=build-env /go/bin/caddy /usr/sbin/caddy COPY docker/caddy.conf /etc/caddy.conf COPY public /srv/www + +CMD ["/usr/sbin/caddy", "-conf", "/etc/caddy.conf"] From 3ba1b6ddf304e0bb79b2f2a14dc526ae5c1ad174 Mon Sep 17 00:00:00 2001 From: Antoine GIRARD Date: Mon, 5 Jun 2017 18:38:33 +0200 Subject: [PATCH 2/3] Update plugins/docker to latest version same as go-gitea/website#45 --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index f17bb42..f941f4a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,6 +13,7 @@ pipeline: docker: image: plugins/docker + pull: true repo: gitea/docs tags: [ '${DRONE_BRANCH##release/v}' ] when: @@ -21,6 +22,7 @@ pipeline: docker: image: plugins/docker + pull: true repo: gitea/docs tags: [ 'latest' ] when: From ec820a881d97dbec7e4c1ba46e9c906f9866d007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20=22BKC=22=20Carlb=C3=A4cker?= Date: Thu, 8 Jun 2017 13:56:48 +0200 Subject: [PATCH 3/3] drone sig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kim "BKC" Carlbäcker --- .drone.yml.sig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml.sig b/.drone.yml.sig index 53b1464..0cba429 100644 --- a/.drone.yml.sig +++ b/.drone.yml.sig @@ -1 +1 @@ -eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIHBhdGg6IHNyYwoKcGlwZWxpbmU6CiAgYnVpbGQ6CiAgICBpbWFnZTogd2ViaGlwcGllL2h1Z286bGF0ZXN0CiAgICBwdWxsOiB0cnVlCiAgICBjb21tYW5kczoKICAgICAgLSBtYWtlIHRyYW5zLWNvcHkKCiAgICAgIC0gbWFrZSBjbGVhbgogICAgICAtIG1ha2UgYnVpbGQKCiAgZG9ja2VyOgogICAgaW1hZ2U6IHBsdWdpbnMvZG9ja2VyCiAgICByZXBvOiBnaXRlYS9kb2NzCiAgICB0YWdzOiBbICcke0RST05FX0JSQU5DSCMjcmVsZWFzZS92fScgXQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCiAgICAgIGJyYW5jaDogWyByZWxlYXNlLyogXQoKICBkb2NrZXI6CiAgICBpbWFnZTogcGx1Z2lucy9kb2NrZXIKICAgIHJlcG86IGdpdGVhL2RvY3MKICAgIHRhZ3M6IFsgJ2xhdGVzdCcgXQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCiAgICAgIGJyYW5jaDogWyBtYXN0ZXIgXQoKICBnaXR0ZXI6CiAgICBpbWFnZTogcGx1Z2lucy9naXR0ZXIK.RPW5ozTUJwd47a23CY34doKDRgcm0DitJ-T5qH61Z-Q \ No newline at end of file +eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIHBhdGg6IHNyYwoKcGlwZWxpbmU6CiAgYnVpbGQ6CiAgICBpbWFnZTogd2ViaGlwcGllL2h1Z286bGF0ZXN0CiAgICBwdWxsOiB0cnVlCiAgICBjb21tYW5kczoKICAgICAgLSBtYWtlIHRyYW5zLWNvcHkKCiAgICAgIC0gbWFrZSBjbGVhbgogICAgICAtIG1ha2UgYnVpbGQKCiAgZG9ja2VyOgogICAgaW1hZ2U6IHBsdWdpbnMvZG9ja2VyCiAgICBwdWxsOiB0cnVlCiAgICByZXBvOiBnaXRlYS9kb2NzCiAgICB0YWdzOiBbICcke0RST05FX0JSQU5DSCMjcmVsZWFzZS92fScgXQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCiAgICAgIGJyYW5jaDogWyByZWxlYXNlLyogXQoKICBkb2NrZXI6CiAgICBpbWFnZTogcGx1Z2lucy9kb2NrZXIKICAgIHB1bGw6IHRydWUKICAgIHJlcG86IGdpdGVhL2RvY3MKICAgIHRhZ3M6IFsgJ2xhdGVzdCcgXQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCiAgICAgIGJyYW5jaDogWyBtYXN0ZXIgXQoKICBnaXR0ZXI6CiAgICBpbWFnZTogcGx1Z2lucy9naXR0ZXIK.-yyNQtRepINu0L0utwOeqe2kg71H4bGMaav5lWOz8-U \ No newline at end of file