chore: update caddy and ci

This commit is contained in:
Viktor Varland 2024-02-02 15:52:22 +01:00
parent f9500b3c4f
commit e83c7e5733
Signed by: varl
GPG key ID: 7459F0B410115EE8
3 changed files with 12 additions and 24 deletions

View file

@ -1,22 +0,0 @@
---
kind: pipeline
type: docker
name: caddy-build-deploy
steps:
- name: build-and-push-image
image: plugins/docker
volumes:
- name: dockersock
path: /var/run/docker.sock
settings:
username: meatbag
password:
from_secret: registry_password
repo: meatbag/caddy
tags: latest
dockerfile: Dockerfile
trigger:
branch:
- main

View file

@ -0,0 +1,10 @@
name: build
run-name: ${{ gitea.actor }} is building caddy
on: [push]
jobs:
build:
run: |
echo "${{ secrets.MEATBAG_REGISTRY_TOKEN }}" | podman login --username registry --password-stdin registry.meatbag.se
podman build -t meatbag/caddy:latest .
podman push meatbag/caddy

View file

@ -1,4 +1,4 @@
FROM caddy:2.6.4-builder AS builder FROM caddy:2.7.5-builder AS builder
# #
## build with additional plugins ## build with additional plugins
@ -8,6 +8,6 @@ RUN xcaddy build \
--with github.com/mholt/caddy-dynamicdns \ --with github.com/mholt/caddy-dynamicdns \
--with github.com/greenpau/caddy-security --with github.com/greenpau/caddy-security
FROM caddy:2.6.4 FROM caddy:2.7.5
COPY --from=builder /usr/bin/caddy /usr/bin/caddy COPY --from=builder /usr/bin/caddy /usr/bin/caddy