fix: use fully qualified domain for container images

ZephOne · ZephOne · commit 31ce3ef37c73 · 2025-03-05T17:15:28.000+01:00
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -65,7 +65,7 @@ services:
       - host.docker.internal:host-gateway
 
   haproxy:
-    image: haproxy
+    image: docker.io/haproxy
     expose:
       - 80
     environment:
@@ -631,10 +631,10 @@ services:
       - host.docker.internal:host-gateway
 
   database-sqlite:
-    image: rwgrim/docker-noop
+    image: docker.io/rwgrim/docker-noop
 
   database-mysql:
-    image: mariadb:10.6
+    image: docker.io/mariadb:10.6
     environment:
       MYSQL_ROOT_PASSWORD: 'nextcloud'
       MYSQL_PASSWORD: 'nextcloud'
@@ -680,7 +680,7 @@ services:
       # - MARIADB_MASTER_DELAY=10
 
   database-maxscale:
-    image: mariadb/maxscale:latest
+    image: docker.io/mariadb/maxscale:latest
     depends_on:
       - database-mariadb-primary
       - database-mariadb-replica
@@ -700,7 +700,7 @@ services:
       - postgres:/var/lib/postgresql
 
   database-oci:
-    image: gvenzl/oracle-free:23
+    image: docker.io/gvenzl/oracle-free:23
     environment:
       ORACLE_PASSWORD: oracle
     ports:
@@ -710,7 +710,7 @@ services:
 
   pgadmin:
     container_name: pgadmin_container
-    image: dpage/pgadmin4
+    image: docker.io/dpage/pgadmin4
     environment:
       VIRTUAL_HOST: "pgadmin${DOMAIN_SUFFIX}"
       PGADMIN_DEFAULT_EMAIL: pgadmin4@nextcloud.local
@@ -724,12 +724,12 @@ services:
       - ${PROXY_SERVICE:-proxy}
 
   redis:
-    image: redis:7
+    image: docker.io/redis:7
     volumes:
       - redis:/data
 
   ldap:
-    image: osixia/openldap
+    image: docker.io/osixia/openldap
     command: --copy-service --loglevel debug
     expose:
       - 389
@@ -743,7 +743,7 @@ services:
       - ./data/ldap:/container/service/slapd/assets/config/bootstrap/ldif/custom
 
   phpmyadmin:
-    image: phpmyadmin
+    image: docker.io/phpmyadmin
     environment:
       VIRTUAL_HOST: "phpmyadmin${DOMAIN_SUFFIX}"
       PMA_ARBITRARY: 1
@@ -752,15 +752,15 @@ services:
       PMA_PASSWORD: nextcloud
 
   ldapadmin:
-    image: osixia/phpldapadmin
+    image: docker.io/osixia/phpldapadmin
     environment:
       PHPLDAPADMIN_LDAP_HOSTS: ldap
       PHPLDAPADMIN_HTTPS: 'false'
     ports:
       - "${IP_BIND:-127.0.0.1}:${PORTBASE:-800}8:80"
 
   saml:
-    image: unicon/simplesamlphp
+    image: docker.io/unicon/simplesamlphp
     volumes:
       - ./docker/configs/var-simplesamlphp/config:/var/simplesamlphp/config
       - ./docker/configs/var-simplesamlphp/cert:/var/simplesamlphp/cert
@@ -784,7 +784,7 @@ services:
       MAIL_PASS: admin
 
   smb:
-    image: dperson/samba
+    image: docker.io/dperson/samba
     ports:
       - "${IP_BIND:-127.0.0.1}:139:139"
       - "${IP_BIND:-127.0.0.1}:445:445"
@@ -802,7 +802,7 @@ services:
       - smbhomes:/smb
 
   blackfire:
-    image: blackfire/blackfire:2
+    image: docker.io/blackfire/blackfire:2
     ports:
       - "${IP_BIND:-127.0.0.1}:8307:8307"
     environment:
@@ -813,7 +813,7 @@ services:
       - BLACKFIRE_DISABLE_LEGACY_PORT=yes
 
   collabora:
-    image: collabora/code:latest
+    image: docker.io/collabora/code:latest
     expose:
       - 9980
     cap_add:
@@ -853,19 +853,19 @@ services:
       tail -f /dev/null
 
   onlyoffice:
-    image: onlyoffice/documentserver:8.2
+    image: docker.io/onlyoffice/documentserver:8.2
     environment:
       VIRTUAL_HOST: onlyoffice${DOMAIN_SUFFIX}
       USE_UNAUTHORIZED_STORAGE: "true"
       JWT_SECRET: secret
     expose:
-      - '80'
+      - "80"
     volumes:
       - document_data:/var/www/onlyoffice/Data
       - document_log:/var/log/onlyoffice
 
   minio:
-    image: minio/minio
+    image: docker.io/minio/minio
     environment:
       VIRTUAL_HOST: minio${DOMAIN_SUFFIX}
       VIRTUAL_PORT: 9001
@@ -901,7 +901,7 @@ services:
       - elasticsearch_data:/usr/share/elasticsearch/data
 
   elasticsearch-ui:
-    image: appbaseio/dejavu
+    image: docker.io/appbaseio/dejavu
     ports:
       - "${IP_BIND:-127.0.0.1}:1358:1358"
     expose:
@@ -938,7 +938,7 @@ services:
       KC_PROXY: edge
 
   av:
-    image: mkodockx/docker-clamav:alpine
+    image: docker.io/mkodockx/docker-clamav:alpine
     container_name: nextav
     restart: unless-stopped
     volumes:
@@ -1046,14 +1046,14 @@ services:
 
 
   previews_hpb:
-    image: nextcloud/aio-imaginary:latest
+    image: docker.io/nextcloud/aio-imaginary:latest
     ports:
       - "${IP_BIND:-127.0.0.1}:8088:8088"
     environment:
       - PORT=8088
 
   talk-signaling:
-    image: strukturag/nextcloud-spreed-signaling:latest
+    image: docker.io/strukturag/nextcloud-spreed-signaling:latest
     environment:
       VIRTUAL_HOST: "talk-signaling${DOMAIN_SUFFIX}"
       HTTP_LISTEN: "0.0.0.0:80"
@@ -1070,7 +1070,7 @@ services:
     image: ghcr.io/juliusknorr/nextcloud-dev-talk-janus:latest
 
   talk-recording:
-    image: nextcloud/aio-talk-recording:latest
+    image: docker.io/nextcloud/aio-talk-recording:latest
     environment:
       NC_DOMAIN: "nextcloud${DOMAIN_SUFFIX}"
       ALLOW_ALL: "true"
diff --git a/docker/Dockerfile.php.template b/docker/Dockerfile.php.template
@@ -1,4 +1,4 @@
-FROM php:8.2-apache
+FROM docker.io/php:8.2-apache
 
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
diff --git a/docker/Dockerfile.php71 b/docker/Dockerfile.php71
@@ -1,4 +1,4 @@
-FROM php:7.1-apache
+FROM docker.io/php:7.1-apache
 
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
diff --git a/docker/Dockerfile.php72 b/docker/Dockerfile.php72
@@ -1,4 +1,4 @@
-FROM php:7.2-apache
+FROM docker.io/php:7.2-apache
 
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
diff --git a/docker/Dockerfile.php73 b/docker/Dockerfile.php73
@@ -1,4 +1,4 @@
-FROM php:7.3-apache
+FROM docker.io/php:7.3-apache
 
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
diff --git a/docker/Dockerfile.php74 b/docker/Dockerfile.php74
@@ -1,4 +1,4 @@
-FROM php:7.4-apache
+FROM docker.io/php:7.4-apache
 
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
diff --git a/docker/Dockerfile.php80 b/docker/Dockerfile.php80
@@ -1,4 +1,4 @@
-FROM php:8.0-apache
+FROM docker.io/php:8.0-apache
 
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
diff --git a/docker/Dockerfile.php81 b/docker/Dockerfile.php81
@@ -1,4 +1,4 @@
-FROM php:8.1-apache
+FROM docker.io/php:8.1-apache
 
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
diff --git a/docker/code/Dockerfile b/docker/code/Dockerfile
@@ -1 +1 @@
-FROM collabora/code
+FROM docker.io/collabora/code
diff --git a/docker/codedev/Dockerfile b/docker/codedev/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 ubuntu:24.04
+FROM --platform=linux/amd64 docker.io/ubuntu:24.04
 
 RUN apt update && \
     apt install -y git build-essential zip ccache junit4 libkrb5-dev nasm graphviz python3 python3-dev qtbase5-dev libkf5coreaddons-dev libkf5i18n-dev libkf5config-dev libkf5windowsystem-dev libkf5kio-dev autoconf libcups2-dev libfontconfig1-dev gperf default-jdk doxygen libxslt1-dev xsltproc libxml2-utils libxrandr-dev libx11-dev bison flex libgtk-3-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev ant ant-optional libnss3-dev libavahi-client-dev libxt-dev \
diff --git a/docker/elasticsearch/Dockerfile b/docker/elasticsearch/Dockerfile
@@ -1,3 +1,3 @@
-FROM elasticsearch:7.17.25
+FROM docker.io/elasticsearch:7.17.25
 
 RUN bin/elasticsearch-plugin install --batch ingest-attachment
diff --git a/docker/ldap/Dockerfile b/docker/ldap/Dockerfile
@@ -1,4 +1,4 @@
-FROM osixia/openldap:latest
+FROM docker.io/osixia/openldap:latest
 
 ENV LDAP_DOMAIN="planetexpress.com"
 ENV LDAP_BASE_DN="dc=planetexpress,dc=com"
diff --git a/docker/lookupserver/Dockerfile b/docker/lookupserver/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:24.04
+FROM docker.io/ubuntu:24.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV DBPASSWD=abrakadabra
diff --git a/docker/mailhog/Dockerfile b/docker/mailhog/Dockerfile
@@ -2,7 +2,7 @@
 # MailHog Dockerfile
 #
 
-FROM golang:alpine as builder
+FROM docker.io/golang:alpine as builder
 
 # Install MailHog:
 RUN apk --no-cache add --virtual build-dependencies \
@@ -11,7 +11,7 @@ RUN apk --no-cache add --virtual build-dependencies \
   && export GOPATH=/root/gocode \
   && go install github.com/mailhog/MailHog@latest
 
-FROM alpine
+FROM docker.io/alpine
 # Add mailhog user/group with uid/gid 1000.
 # This is a workaround for boot2docker issue #581, see
 # https://github.com/boot2docker/boot2docker/issues/581
diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
@@ -1,2 +1,2 @@
-FROM nginxproxy/nginx-proxy:latest
+FROM docker.io/nginxproxy/nginx-proxy:latest
 ADD nginx/my_proxy.conf /etc/nginx/conf.d
diff --git a/docker/php82/Dockerfile b/docker/php82/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2-apache
+FROM docker.io/php:8.2-apache
 
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
diff --git a/docker/php83/Dockerfile b/docker/php83/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.3-apache
+FROM docker.io/php:8.3-apache
 
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
diff --git a/docker/php84/Dockerfile b/docker/php84/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.4-apache
+FROM docker.io/php:8.4-apache
 
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
diff --git a/docker/push/Dockerfile b/docker/push/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine
+FROM docker.io/alpine
 
 RUN wget https://github.com/nextcloud/notify_push/releases/download/v0.6.3/notify_push-`uname -m`-unknown-linux-musl -O /notify_push && chmod +x /notify_push && /notify_push --version
 
diff --git a/docker/saml/Dockerfile b/docker/saml/Dockerfile
@@ -1,3 +1,3 @@
-FROM unicon/simplesamlphp:latest
+FROM docker.io/unicon/simplesamlphp:latest
 
 #COPY etc-httpd/ /etc/httpd/
diff --git a/docker/smb/Dockerfile b/docker/smb/Dockerfile
@@ -1 +1 @@
-FROM dperson/samba:latest
+FROM docker.io/dperson/samba:latest
diff --git a/docker/talk-janus/Dockerfile b/docker/talk-janus/Dockerfile
@@ -1,7 +1,7 @@
 # Taken from https://github.com/strukturag/nextcloud-spreed-signaling/blob/54c1af7f4f1b598a9f2c1ae37b76b37e9dda3ee8/docker/janus/Dockerfile
 
 # Modified from https://gitlab.com/powerpaul17/nc_talk_backend/-/blob/dcbb918d8716dad1eb72a889d1e6aa1e3a543641/docker/janus/Dockerfile
-FROM alpine:3.18
+FROM docker.io/alpine:3.18
 
 RUN apk add --no-cache curl autoconf automake libtool pkgconf build-base \
   glib-dev libconfig-dev libnice-dev jansson-dev openssl-dev zlib libsrtp-dev \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:8.2-apache`
	`1`	`+FROM docker.io/php:8.2-apache`
`2`	`2`
`3`	`3`	`ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:7.1-apache`
	`1`	`+FROM docker.io/php:7.1-apache`
`2`	`2`
`3`	`3`	`ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:7.2-apache`
	`1`	`+FROM docker.io/php:7.2-apache`
`2`	`2`
`3`	`3`	`ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:7.3-apache`
	`1`	`+FROM docker.io/php:7.3-apache`
`2`	`2`
`3`	`3`	`ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:7.4-apache`
	`1`	`+FROM docker.io/php:7.4-apache`
`2`	`2`
`3`	`3`	`ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:8.0-apache`
	`1`	`+FROM docker.io/php:8.0-apache`
`2`	`2`
`3`	`3`	`ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:8.1-apache`
	`1`	`+FROM docker.io/php:8.1-apache`
`2`	`2`
`3`	`3`	`ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-FROM collabora/code`
	`1`	`+FROM docker.io/collabora/code`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM --platform=linux/amd64 ubuntu:24.04`
	`1`	`+FROM --platform=linux/amd64 docker.io/ubuntu:24.04`
`2`	`2`
`3`	`3`	`RUN apt update && \`
`4`	`4`	`apt install -y git build-essential zip ccache junit4 libkrb5-dev nasm graphviz python3 python3-dev qtbase5-dev libkf5coreaddons-dev libkf5i18n-dev libkf5config-dev libkf5windowsystem-dev libkf5kio-dev autoconf libcups2-dev libfontconfig1-dev gperf default-jdk doxygen libxslt1-dev xsltproc libxml2-utils libxrandr-dev libx11-dev bison flex libgtk-3-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev ant ant-optional libnss3-dev libavahi-client-dev libxt-dev \`