From d5f3126d6c19294849ffa920ad98a48de0758e17 Mon Sep 17 00:00:00 2001
From: Timon Klinkert <83671398+DenuxPlays@users.noreply.github.com>
Date: Fri, 3 Apr 2026 22:34:05 +0200
Subject: [PATCH] Also push to github registry (#8669)

Closes https://github.com/FreshRSS/FreshRSS/issues/8647

Changes proposed in this pull request:

- add push to ghcr
---
 .github/workflows/docker-publish.yml | 17 +++++++++--------
 Docker/README.md                     |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index b3a6dae5c..36db48f82 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -10,7 +10,7 @@ on:
 
 permissions:
   contents: read
-  # packages: write
+  packages: write
 
 jobs:
   build-container-image:
@@ -61,7 +61,7 @@ jobs:
         flavor: ${{ matrix.flavor }}
         images: |
           docker.io/freshrss/freshrss
-      #     ghcr.io/${{ github.repository }}
+          ghcr.io/${{ github.repository }}
         tags: ${{ matrix.tags }}
         labels: |
           org.opencontainers.image.url=https://freshrss.org/
@@ -74,12 +74,13 @@ jobs:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-    # - name: Login to GitHub Container Registry
-    #   uses: docker/login-action@v4
-    #   with:
-    #     registry: ghcr.io
-    #     username: ${{ github.repository_owner }}
-    #     password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Login to GitHub Container Registry
+      if: github.repository_owner == 'FreshRSS'
+      uses: docker/login-action@v4
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Build and push Docker images
       uses: docker/build-push-action@v7
diff --git a/Docker/README.md b/Docker/README.md
index c76af5f4f..054d6c670 100644
--- a/Docker/README.md
+++ b/Docker/README.md
@@ -6,7 +6,7 @@
 FreshRSS is a self-hosted RSS feed aggregator.
 
 * Official website: [`freshrss.org`](https://freshrss.org/)
-* Official Docker images: [`hub.docker.com/r/freshrss/freshrss`](https://hub.docker.com/r/freshrss/freshrss/)
+* Official Docker images: [`hub.docker.com/r/freshrss/freshrss`](https://hub.docker.com/r/freshrss/freshrss/) [`ghcr.io/freshrss/freshrss`](https://github.com/FreshRSS/FreshRSS/pkgs/container/freshrss)
 * Repository: [`github.com/FreshRSS/FreshRSS`](https://github.com/FreshRSS/FreshRSS/)
 * Documentation: [`freshrss.github.io/FreshRSS`](https://freshrss.github.io/FreshRSS/)
 * License: [GNU AGPL 3](https://www.gnu.org/licenses/agpl-3.0.html)