From f3bef1ab08ba75653a2fea08ff70932fd9f5f614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wysoki=C5=84ski?= Date: Sat, 23 Jul 2022 08:21:07 +0200 Subject: [PATCH] chore: v2.5.2 --- .drone.yml | 41 +++++++++++++++++++++++++++++++++++++++++ Dockerfile | 4 ++-- manifest.tmpl | 6 ++++++ 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8e7e631..4e1f412 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,7 +1,12 @@ +--- kind: pipeline type: docker name: linux-amd64 +platform: + os: linux + arch: amd64 + steps: - name: publish image: plugins/docker @@ -19,6 +24,31 @@ trigger: event: - tag +--- +kind: pipeline +type: docker +name: linux-arm64 + +platform: + os: linux + arch: arm64 + +steps: + - name: publish + image: plugins/docker + settings: + username: + from_secret: docker_username + password: + from_secret: docker_password + repo: kichiyaki/caddy + auto_tag: true + dockerfile: Dockerfile + +trigger: + event: + - tag + --- kind: pipeline type: docker @@ -35,6 +65,16 @@ steps: from_secret: docker_username password: from_secret: docker_password + - name: manifest-latest + image: plugins/manifest + settings: + tags: latest + ignore_missing: "true" + spec: manifest.tmpl + username: + from_secret: docker_username + password: + from_secret: docker_password trigger: event: @@ -42,3 +82,4 @@ trigger: depends_on: - linux-amd64 + - linux-arm64 diff --git a/Dockerfile b/Dockerfile index a9fbb7e..126f96c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM caddy:2.5.1-builder AS builder +FROM caddy:2.5.2-builder AS builder RUN xcaddy build \ --with github.com/caddy-dns/cloudflare -FROM caddy:2.5.1 +FROM caddy:2.5.2 COPY --from=builder /usr/bin/caddy /usr/bin/caddy diff --git a/manifest.tmpl b/manifest.tmpl index 67c6f90..2f3661b 100644 --- a/manifest.tmpl +++ b/manifest.tmpl @@ -11,3 +11,9 @@ manifests: platform: architecture: amd64 os: linux + - + image: kichiyaki/caddy:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 + platform: + variant: v8 + architecture: arm64 + os: linux