diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index 32c183c..7e925f0 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -1,55 +1,55 @@ -name: CI - -on: - push: - branches: - - main - pull_request: {} - workflow_dispatch: {} - -jobs: - release: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - lfs: true - - - name: Setup QEMU - uses: docker/setup-qemu-action@v3 - - - name: Setup docker buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to Container Registery - uses: docker/login-action@v3 - with: - registry: git.housh.dev - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Extract metadata for Docker - id: meta - uses: docker/metadata-action@v5 - with: - images: git.housh.dev/homelab/caddy-rogue-mini - tags: | - type=schedule - type=ref,event=branch - type=ref,event=pr - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=semver,pattern={{major}} - type=sha - type=raw,value=latest - - - name: Build and push Docker image - uses: docker/build-push-action@v6 - with: - context: . - file: ./Dockerfile - platforms: linux/arm64 - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} +# name: CI +# +# on: +# push: +# branches: +# - main +# pull_request: {} +# workflow_dispatch: {} +# +# jobs: +# release: +# runs-on: ubuntu-latest +# steps: +# - name: Checkout +# uses: actions/checkout@v4 +# with: +# lfs: true +# +# - name: Setup QEMU +# uses: docker/setup-qemu-action@v3 +# +# - name: Setup docker buildx +# uses: docker/setup-buildx-action@v3 +# +# - name: Login to Container Registery +# uses: docker/login-action@v3 +# with: +# registry: git.housh.dev +# username: ${{ secrets.DOCKER_USERNAME }} +# password: ${{ secrets.DOCKER_PASSWORD }} +# +# - name: Extract metadata for Docker +# id: meta +# uses: docker/metadata-action@v5 +# with: +# images: git.housh.dev/homelab/caddy-rogue-mini +# tags: | +# type=schedule +# type=ref,event=branch +# type=ref,event=pr +# type=semver,pattern={{version}} +# type=semver,pattern={{major}}.{{minor}} +# type=semver,pattern={{major}} +# type=sha +# type=raw,value=latest +# +# - name: Build and push Docker image +# uses: docker/build-push-action@v6 +# with: +# context: . +# file: ./Dockerfile +# platforms: linux/arm64 +# push: true +# tags: ${{ steps.meta.outputs.tags }} +# labels: ${{ steps.meta.outputs.labels }} diff --git a/Dockerfile b/Dockerfile index 05968d6..09749fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,8 @@ -FROM docker.io/library/caddy:2.9.1-builder as builder +FROM docker.io/library/caddy:2.9.1-builder AS builder RUN xcaddy build \ --with github.com/caddy-dns/cloudflare -COPY ./config /etc/caddy -RUN /usr/bin/caddy fmt --overwrite /etc/caddy/Caddyfile - -# ================================================== -# Run image. -# ================================================== FROM docker.io/library/caddy:2.9.1-alpine COPY --from=builder /usr/bin/caddy /usr/bin/caddy -COPY --from=builder /etc/caddy/Caddyfile /etc/caddy/Caddyfile +COPY ./config /etc/caddy diff --git a/compose.yaml b/compose.yaml index 3e9b69c..3b138a8 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,9 +1,9 @@ services: caddy: - # build: - # context: . - # dockerfile: Dockerfile - image: git.housh.dev/homelab/caddy-rogue-mini:latest + build: + context: . + dockerfile: Dockerfile + # image: git.housh.dev/homelab/caddy-rogue-mini:latest container_name: caddy restart: unless-stopped env_file: @@ -19,7 +19,7 @@ services: cap_add: - NET_ADMIN volumes: - - ./config:/etc/caddy:z + - ./config:/etc/caddy - caddy_data:/data - caddy_config:/config networks: