From 99c6566f6d20ee8a2b357ed425e668498fe5c1a1 Mon Sep 17 00:00:00 2001
From: Till Klampaeckel <till@php.net>
Date: Wed, 4 Dec 2024 15:31:19 +0100
Subject: [PATCH] Fix(release): unify name/tags

---
 .github/workflows/pr.yml      |  4 +++-
 .github/workflows/release.yml | 12 +++++++++++-
 README.md                     |  6 +++---
 rootfs/Dockerfile             |  1 +
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index ce9e166..5baa0ac 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -20,7 +20,9 @@ jobs:
     - id: meta
       uses: docker/metadata-action@v5
       with:
-        images: r.planetary-quantum.com/quantum-public/${{ github.repository }}
+        images: |
+          r.planetary-quantum.com/quantum-public/caddy
+          ghcr.io/hostwithquantum/quantum-caddy
     - uses: docker/build-push-action@v6
       with:
         context: rootfs
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e6fc178..e314ceb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,8 +8,16 @@ on:
 jobs:
   build_push:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
     steps:
     - uses: actions/checkout@v4
+    - uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
     - uses: docker/login-action@v3
       with:
         registry: r.planetary-quantum.com
@@ -18,7 +26,9 @@ jobs:
     - id: meta
       uses: docker/metadata-action@v5
       with:
-        images: r.planetary-quantum.com/quantum-public/${{ github.repository }}
+        images: |
+          r.planetary-quantum.com/quantum-public/caddy
+          ghcr.io/hostwithquantum/quantum-caddy
     - uses: docker/build-push-action@v6
       with:
         context: rootfs/
diff --git a/README.md b/README.md
index 49302d4..cfced83 100644
--- a/README.md
+++ b/README.md
@@ -9,10 +9,10 @@ Modules/plugins:
 
 ## Images
 
-Images are available and free to use for anyone. To download and use an image:
+Images are available on Github or on our registry, and free to use for anyone. To download and use an image:
 
 ```sh
-$ docker pull r.planetary-quantum.com/quantum-public/hostwithquantum/quantum-caddy@TAG
+$ docker pull r.planetary-quantum.com/quantum-public/caddy@TAG
 ```
 
-> Note: The docker tags match release tags in this repository.
\ No newline at end of file
+> Note: The docker tags match release tags in this repository. The follow the format of `vCADDY+pq.X`.
\ No newline at end of file
diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile
index a24d858..e975fb4 100644
--- a/rootfs/Dockerfile
+++ b/rootfs/Dockerfile
@@ -9,6 +9,7 @@ RUN xcaddy build \
 FROM caddy:2.8.4
 
 LABEL org.opencontainers.image.description "A Caddy reverse proxy with s3 storage for certmagic, service discovery via labels"
+LABEL org.opencontainers.image.source="https://github.com/hostwithquantum/quantum-caddy"
 
 ENV S3_BUCKET ""
 ENV S3_ACCESS_ID ""