Switch all images to the new registry (#1109)

* Switch all images to the new registry

* Update compose files

* Update Readme

* Fix several merge issues.

---------

Co-authored-by: Konstantin Koval

.github/workflows/build.yml

@@ -14,10 +14,10 @@ on:
 env:
   IS_PUSHING_IMAGES: ${{ github.event_name != 'pull_request' && github.repository == 'photoview/photoview' }}
   # IS_PUSHING_IMAGES: true # Switch on when pushing images with forked repos.
-  DOCKER_REGISTRY: ${{ (github.repository == 'photoview/photoview' && '') || 'ghcr.io/' }}
+  DOCKER_REGISTRY: ${{ github.repository != 'photoview/photoview' && 'ghcr.io/' || '' }}
   DOCKER_USERNAME: viktorstrate
-  DOCKER_IMAGE: ${{ (github.repository == 'photoview/photoview' && 'viktorstrate/photoview') || github.repository }}
   DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+  DOCKER_IMAGE: ${{ github.repository }}
   PLATFORMS: linux/amd64,linux/arm64,linux/arm/v7
 
 jobs:
@@ -91,9 +91,9 @@ jobs:
         if: ${{ env.IS_PUSHING_IMAGES == 'true' }}
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.DOCKER_REGISTRY == 'ghcr.io/' && 'ghcr.io' }}
+          registry: ${{ env.DOCKER_REGISTRY == 'ghcr.io/' && 'ghcr.io' || '' }}
-          username: ${{ ( env.DOCKER_REGISTRY == 'ghcr.io/' && github.actor ) || env.DOCKER_USERNAME }}
+          username: ${{ env.DOCKER_REGISTRY == 'ghcr.io/' && github.actor || env.DOCKER_USERNAME }}
-          password: ${{ ( env.DOCKER_REGISTRY == 'ghcr.io/' && github.token ) || env.DOCKER_PASSWORD }}
+          password: ${{ env.DOCKER_REGISTRY == 'ghcr.io/' && github.token || env.DOCKER_PASSWORD }}
 
       - name: Docker meta
         id: docker_meta
@@ -140,6 +140,7 @@ jobs:
       fail-fast: false
       matrix:
         tags: ${{ fromJson(needs.prepare.outputs.tags) }}
+    # Comment out when pushing images with forked repos.
     if: ${{ github.event_name != 'pull_request' && github.repository == 'photoview/photoview' }}
     steps:
       # Makes sure your .dockleignore file is available to the next step
@@ -151,8 +152,9 @@ jobs:
       - name: Docker Login
         uses: docker/login-action@v3
         with:
-          username: ${{ env.DOCKER_USERNAME }}
+          registry: ${{ env.DOCKER_REGISTRY == 'ghcr.io/' && 'ghcr.io' || '' }}
-          password: ${{ env.DOCKER_PASSWORD }}
+          username: ${{ env.DOCKER_REGISTRY == 'ghcr.io/' && github.actor || env.DOCKER_USERNAME }}
+          password: ${{ env.DOCKER_REGISTRY == 'ghcr.io/' && github.token || env.DOCKER_PASSWORD }}
 
       - name: Run Dockle for '${{ env.DOCKER_REGISTRY }}${{ env.DOCKER_IMAGE }}:${{ matrix.tags.tag }}'
         id: dockle

Dockerfile

@@ -64,7 +64,7 @@ RUN chmod +x /app/scripts/*.sh \
   && /app/scripts/install_build_dependencies.sh \
   && /app/scripts/install_runtime_dependencies.sh
 
-COPY --from=viktorstrate/dependencies /artifacts.tar.gz /dependencies/
+COPY --from=photoview/dependencies /artifacts.tar.gz /dependencies/
 # Split values in `/env`
 # hadolint ignore=SC2046
 RUN export $(cat /env) \

README.md

@@ -17,25 +17,43 @@ When your media has been scanned, they show up on the website, organised in the
 > If you have questions regarding setup or development,
 feel free to join the Discord server https://discord.gg/jQ392948u9
 
+# ATTENTION to Docker users !!!
+
+We migrated to the new Docker registry <https://hub.docker.com/r/photoview/photoview> and all new images for the `master` tag, as well as future releases are going to be published there instead of the previously used registry. Old images will be still accessible in the old registry <https://hub.docker.com/r/viktorstrate/photoview>, so if you want to use 1 of those old images, you need to revert back to the old registry.
+
+Please update your `docker-compose.yml` file to use the new registry for the `photoview` image, as shown in the corresponding example of the compose file: <https://github.com/photoview/photoview/tree/master/docker-compose%20example>
+
 ## Demo site
 
 Visit https://photos.qpqp.dk/
 
 Username: **demo**
+
 Password: **demo**
 
 ## Contents
 
-- [Demo site](#demo-site)
+- [ATTENTION to Docker users !!!](#attention-to-docker-users-)
-- [Main features](#main-features)
+  - [Demo site](#demo-site)
-- [Supported Platforms](#supported-platforms)
+  - [Contents](#contents)
-- [Why yet another self-hosted photo gallery](#why-yet-another-self-hosted-photo-gallery)
+  - [Main features](#main-features)
-- [Getting started — Setup with Docker](#getting-started--setup-with-docker)
+  - [Supported platforms](#supported-platforms)
-- [Advanced setup](#advanced-setup)
+  - [Why yet another self-hosted photo gallery](#why-yet-another-self-hosted-photo-gallery)
-- [Contributing](#contributing)
+  - [Getting started — Setup with Docker](#getting-started--setup-with-docker)
-- [Set up Docker development environment](#set-up-docker-development-environment)
+    - [Initial Setup](#initial-setup)
-- [Set up local development environment](#set-up-local-development-environment)
+  - [Advanced setup](#advanced-setup)
-- [Sponsors](#sponsors)
+    - [Hardware Acceleration](#hardware-acceleration)
+  - [Contributing](#contributing)
+  - [Set up Docker development environment](#set-up-docker-development-environment)
+    - [Start API and UI server with Docker Compose](#start-api-and-ui-server-with-docker-compose)
+    - [Start API server with Docker](#start-api-server-with-docker)
+    - [Start UI server with Docker](#start-ui-server-with-docker)
+  - [Set up local development environment](#set-up-local-development-environment)
+    - [Install dependencies](#install-dependencies)
+    - [Local setup](#local-setup)
+    - [Start API server](#start-api-server)
+    - [Start UI server](#start-ui-server)
+  - [Sponsors](#sponsors)
 
 ## Main features
 

docker-compose example/docker-compose.example.yml

@@ -1,6 +1,6 @@
 services:
   photoview:
-    image: viktorstrate/photoview:2
+    image: photoview/photoview:2
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
     hostname: photoview

docker-compose example/docker-compose.minimal.example.yml

@@ -1,6 +1,6 @@
 services:
   photoview:
-    image: viktorstrate/photoview:2
+    image: photoview/photoview:2
     hostname: photoview
     container_name: photoview
     restart: unless-stopped