Changed default image to swissmakers/fail2ban-ui:latest with swissmakers registry as a commented fallback

.gitea/workflows/build-harbor.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Login to Harbor (Robot)
+      - name: Login to Swissmakers Registry
         if: ${{ secrets.HARBOR_REGISTRY && secrets.HARBOR_USERNAME && secrets.HARBOR_PASSWORD }}
         env:
           REGISTRY: ${{ secrets.HARBOR_REGISTRY }}
@@ -21,8 +21,7 @@ jobs:
           mkdir -p "$HOME/.config/containers"
           echo "$ROBOT_PASS" | podman login --username "$ROBOT_USER" --password-stdin "$REGISTRY"
 
-
+      - name: Build & tag for Swissmakers Registry
-      - name: Build & tag
         env:
           REG:  ${{ secrets.HARBOR_REGISTRY }}
           PROJ: ${{ secrets.HARBOR_PROJECT }}
@@ -30,10 +29,38 @@ jobs:
           podman build -t $REG/$PROJ/fail2ban-ui:${{ github.sha }} .
           podman tag  $REG/$PROJ/fail2ban-ui:${{ github.sha }} $REG/$PROJ/fail2ban-ui:latest
 
-      - name: Push
+      - name: Push to Swissmakers Registry
         env:
           REG:  ${{ secrets.HARBOR_REGISTRY }}
           PROJ: ${{ secrets.HARBOR_PROJECT }}
         run: |
           podman push $REG/$PROJ/fail2ban-ui:${{ github.sha }}
           podman push $REG/$PROJ/fail2ban-ui:latest
+
+      - name: Login to Docker Hub
+        if: ${{ secrets.DOCKERHUB_USERNAME && secrets.DOCKERHUB_TOKEN }}
+        env:
+          DH_USER: ${{ secrets.DOCKERHUB_USERNAME }}
+          DH_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+        run: |
+          echo "$DH_TOKEN" | podman login docker.io --username "$DH_USER" --password-stdin
+
+      - name: Re-tag the build image for Docker Hub
+        if: ${{ secrets.DOCKERHUB_USERNAME && secrets.DOCKERHUB_TOKEN }}
+        env:
+          REG:  ${{ secrets.HARBOR_REGISTRY }}
+          PROJ: ${{ secrets.HARBOR_PROJECT }}
+          DH_NS: ${{ secrets.DOCKERHUB_USERNAME }}
+          DH_REPO: fail2ban-ui
+        run: |
+          podman tag $REG/$PROJ/fail2ban-ui:${{ github.sha }} docker.io/$DH_NS/$DH_REPO:${{ github.sha }}
+          podman tag $REG/$PROJ/fail2ban-ui:${{ github.sha }} docker.io/$DH_NS/$DH_REPO:latest
+
+      - name: Push to Docker Hub
+        if: ${{ secrets.DOCKERHUB_USERNAME && secrets.DOCKERHUB_TOKEN }}
+        env:
+          DH_NS: ${{ secrets.DOCKERHUB_USERNAME }}
+          DH_REPO: fail2ban-ui
+        run: |
+          podman push docker.io/$DH_NS/$DH_REPO:${{ github.sha }}
+          podman push docker.io/$DH_NS/$DH_REPO:latest

README.md

@@ -250,12 +250,16 @@ Comprehensive settings management for alerts, advanced banning, and system prefe
 
 **Option A: Using Pre-built Image**
 
-Pull and run the official image:
+Pull and run the official image from Docker Hub:
 ```bash
-# Pull the image
+# Pull the image from Docker Hub (default)
-podman pull registry.swissmakers.ch/infra/fail2ban-ui:latest
+podman pull swissmakers/fail2ban-ui:latest
 # or with Docker:
-docker pull registry.swissmakers.ch/infra/fail2ban-ui:latest
+docker pull swissmakers/fail2ban-ui:latest
+
+# Alternative: Pull from Swissmakers registry (fallback)
+# podman pull registry.swissmakers.ch/infra/fail2ban-ui:latest
+# docker pull registry.swissmakers.ch/infra/fail2ban-ui:latest
 
 # Run the container
 podman run -d \
@@ -265,7 +269,7 @@ podman run -d \
   -v /etc/fail2ban:/etc/fail2ban:Z \
   -v /var/log:/var/log:ro \
   -v /var/run/fail2ban:/var/run/fail2ban \
-  registry.swissmakers.ch/infra/fail2ban-ui:latest
+  swissmakers/fail2ban-ui:latest
 ```
 
 **Option B: Build from Source**
@@ -320,7 +324,7 @@ podman run -d \
   -v /etc/fail2ban:/etc/fail2ban:Z \
   -v /var/log:/var/log:ro \
   -v /var/run/fail2ban:/var/run/fail2ban \
-  registry.swissmakers.ch/infra/fail2ban-ui:latest
+  swissmakers/fail2ban-ui:latest
 ```
 
 Access the web interface at `http://localhost:3080`.

deployment/container/README.md

@@ -19,7 +19,14 @@ A comprehensive guide for building and deploying Fail2Ban UI using containers (D
 
 ### Using Pre-built Image
 
-**Pull the official image:**
+**Pull the official image from Docker Hub (default):**
+```bash
+podman pull swissmakers/fail2ban-ui:latest
+# or with Docker:
+docker pull swissmakers/fail2ban-ui:latest
+```
+
+**Alternative: Pull from Swissmakers registry (fallback):**
 ```bash
 podman pull registry.swissmakers.ch/infra/fail2ban-ui:latest
 # or with Docker:
@@ -35,7 +42,7 @@ podman run -d \
   -v /etc/fail2ban:/etc/fail2ban:Z \
   -v /var/log:/var/log:ro \
   -v /var/run/fail2ban:/var/run/fail2ban \
-  registry.swissmakers.ch/infra/fail2ban-ui:latest
+  swissmakers/fail2ban-ui:latest
 ```
 
 Access the web interface at `http://localhost:8080` (or your configured port).
@@ -262,8 +269,11 @@ For easier management, you can use Docker Compose. Create a `docker-compose.yml`
 ```yaml
 services:
   fail2ban-ui:
-    # Use pre-built image from registry
+    # Use pre-built image from Docker Hub (default)
-    image: registry.swissmakers.ch/infra/fail2ban-ui:latest
+    image: swissmakers/fail2ban-ui:latest
+
+    # Alternative: Use Swissmakers registry (fallback)
+    # image: registry.swissmakers.ch/infra/fail2ban-ui:latest
 
     # Or build from source (uncomment to use):
     # build:

deployment/systemd/README.md

@@ -146,7 +146,7 @@ ExecStart=/usr/bin/podman run --rm \
     -v /etc/fail2ban:/etc/fail2ban:Z \
     -v /var/log:/var/log:ro \
     -v /var/run/fail2ban:/var/run/fail2ban \
-    registry.swissmakers.ch/infra/fail2ban-ui:latest
+    swissmakers/fail2ban-ui:latest
 Restart=always
 RestartSec=10s
 

docker-compose-allinone.example.yml

@@ -26,8 +26,12 @@ services:
     restart: unless-stopped
 
   fail2ban-ui:
-    image: registry.swissmakers.ch/infra/fail2ban-ui:latest
+    # Use pre-built image from Docker Hub (default)
-    #image: localhost/fail2ban-ui:dev
+    image: swissmakers/fail2ban-ui:latest
+    # Alternative: Use Swissmakers registry (fallback)
+    # image: registry.swissmakers.ch/infra/fail2ban-ui:latest
+    # Or build from source (uncomment to use):
+    # image: localhost/fail2ban-ui:dev
     container_name: fail2ban-ui
     privileged: true # needed because the fail2ban-ui container needs to modify the fail2ban config owned by root inside the linuxserver-fail2ban container
     network_mode: host

docker-compose.example.yml

@@ -1,7 +1,10 @@
 services:
   fail2ban-ui:
-    # Use pre-built image from registry
+    # Use pre-built image from Docker Hub (default)
-    image: registry.swissmakers.ch/infra/fail2ban-ui:latest
+    image: swissmakers/fail2ban-ui:latest
+
+    # Alternative: Use Swissmakers registry (fallback)
+    # image: registry.swissmakers.ch/infra/fail2ban-ui:latest
 
     # Or build from source (uncomment to use):
     # build: