From 1e1efbbea787b834ecda0c157357617617f643cf Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sat, 14 Oct 2023 11:21:22 +0200
Subject: [PATCH] Use docker.io

---
 .github/workflows/publish.yml | 12 ++++++------
 README.md                     |  9 ++-------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index f97c900..c3bd952 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -25,19 +25,19 @@ jobs:
             - name: Login to GitHub registry
               uses: docker/login-action@v2
               with:
-                  registry: ghcr.io
-                  username: ${{ github.repository_owner }}
-                  password: ${{ secrets.GITHUB_TOKEN }}
+                  registry: docker.io
+                  username: ${{ secrets.DOCKER_REPOSITORY_LOGIN }}
+                  password: ${{ secrets.DOCKER_REPOSITORY_PASSWORD }}
 
-            - name: Build image
+            - name: Build and push image
               run: make docker-build
               env:
                   DOCKER_BUILDKIT: 1
                   PLATFORM: linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/386,linux/ppc64le,linux/amd64
-                  IMAGE_TAG: ghcr.io/sudo-bot/docker-dmarc-srg/docker-dmarc-srg
+                  IMAGE_TAG: docker.io/botsudo/docker-dmarc-srg
                   ACTION: push
 
             - name: Test image
               run: make docker-test
               env:
-                  IMAGE_TAG: ghcr.io/sudo-bot/docker-dmarc-srg/docker-dmarc-srg
+                  IMAGE_TAG: docker.io/botsudo/docker-dmarc-srg
diff --git a/README.md b/README.md
index 6b8af58..c640513 100644
--- a/README.md
+++ b/README.md
@@ -31,20 +31,15 @@ That will be moved to `DMARC-PROCESSED.Aggregate` or `DMARC-PROCESSED.Invalid`.
 
 ## Usage
 
-Note: you need to login to ghcr.io using your GitHub account:
-
-```sh
-docker login ghcr.io
-```
-
 ```yml
 version: "2.3"
 
 services:
 
     dmarc-srg:
-        image: ${IMAGE_TAG}
+        image: docker.io/botsudo/docker-dmarc-srg
         container_name: dmarc-srg
+        user: application
         # If you want to mount a custom config and skip the ENVs
         #volumes:
         #  - ./config.php:/var/www/html/config/conf.php:ro