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)