Docker: Upgrade MariaDB from 10.6 to 10.7 in config examples #2178
This commit is contained in:
parent
a219aa9932
commit
36d84de0c4
|
@ -144,17 +144,19 @@ services:
|
||||||
## MariaDB Database Server
|
## MariaDB Database Server
|
||||||
## Docs: https://mariadb.com/docs/reference/cs10.6/
|
## Docs: https://mariadb.com/docs/reference/cs10.6/
|
||||||
mariadb:
|
mariadb:
|
||||||
image: mariadb:10.6
|
image: mariadb:10.7
|
||||||
command: mysqld --port=4001 --transaction-isolation=READ-COMMITTED --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=512 --innodb-rollback-on-timeout=OFF --innodb-lock-wait-timeout=120
|
command: mysqld --port=4001 --transaction-isolation=READ-COMMITTED --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=512 --innodb-rollback-on-timeout=OFF --innodb-lock-wait-timeout=120
|
||||||
expose:
|
expose:
|
||||||
- "4001" # database port (internal)
|
- "4001" # database port (internal)
|
||||||
volumes:
|
volumes:
|
||||||
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: photoprism
|
MARIADB_AUTO_UPGRADE: "1"
|
||||||
MYSQL_USER: photoprism
|
MARIADB_INITDB_SKIP_TZINFO: "1"
|
||||||
MYSQL_PASSWORD: photoprism
|
MARIADB_DATABASE: "photoprism"
|
||||||
MYSQL_DATABASE: photoprism
|
MARIADB_USER: "photoprism"
|
||||||
|
MARIADB_PASSWORD: "photoprism"
|
||||||
|
MARIADB_ROOT_PASSWORD: "photoprism"
|
||||||
|
|
||||||
## Dummy WebDAV Server
|
## Dummy WebDAV Server
|
||||||
dummy-webdav:
|
dummy-webdav:
|
||||||
|
|
|
@ -14,10 +14,12 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: photoprism
|
MARIADB_AUTO_UPGRADE: "1"
|
||||||
MYSQL_USER: photoprism
|
MARIADB_INITDB_SKIP_TZINFO: "1"
|
||||||
MYSQL_PASSWORD: photoprism
|
MARIADB_DATABASE: "photoprism"
|
||||||
MYSQL_DATABASE: photoprism
|
MARIADB_USER: "photoprism"
|
||||||
|
MARIADB_PASSWORD: "photoprism"
|
||||||
|
MARIADB_ROOT_PASSWORD: "photoprism"
|
||||||
|
|
||||||
## MariaDB 10.7 Database Server
|
## MariaDB 10.7 Database Server
|
||||||
mariadb-10-7:
|
mariadb-10-7:
|
||||||
|
@ -28,10 +30,12 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: photoprism
|
MARIADB_AUTO_UPGRADE: "1"
|
||||||
MYSQL_USER: photoprism
|
MARIADB_INITDB_SKIP_TZINFO: "1"
|
||||||
MYSQL_PASSWORD: photoprism
|
MARIADB_DATABASE: "photoprism"
|
||||||
MYSQL_DATABASE: photoprism
|
MARIADB_USER: "photoprism"
|
||||||
|
MARIADB_PASSWORD: "photoprism"
|
||||||
|
MARIADB_ROOT_PASSWORD: "photoprism"
|
||||||
|
|
||||||
## MariaDB 10.5.5 Database Server
|
## MariaDB 10.5.5 Database Server
|
||||||
## Affected by MDEV-25362: Incorrect name resolution for subqueries in ON expressions
|
## Affected by MDEV-25362: Incorrect name resolution for subqueries in ON expressions
|
||||||
|
@ -44,10 +48,10 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: photoprism
|
MYSQL_DATABASE: "photoprism"
|
||||||
MYSQL_USER: photoprism
|
MYSQL_USER: "photoprism"
|
||||||
MYSQL_PASSWORD: photoprism
|
MYSQL_PASSWORD: "photoprism"
|
||||||
MYSQL_DATABASE: photoprism
|
MYSQL_ROOT_PASSWORD: "photoprism"
|
||||||
|
|
||||||
## MariaDB 10.3 Database Server
|
## MariaDB 10.3 Database Server
|
||||||
## Docs: https://mariadb.com/docs/reference/cs10.3/
|
## Docs: https://mariadb.com/docs/reference/cs10.3/
|
||||||
|
@ -59,10 +63,10 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: photoprism
|
MYSQL_DATABASE: "photoprism"
|
||||||
MYSQL_USER: photoprism
|
MYSQL_USER: "photoprism"
|
||||||
MYSQL_PASSWORD: photoprism
|
MYSQL_PASSWORD: "photoprism"
|
||||||
MYSQL_DATABASE: photoprism
|
MYSQL_ROOT_PASSWORD: "photoprism"
|
||||||
|
|
||||||
## MariaDB 10.2 Database Server
|
## MariaDB 10.2 Database Server
|
||||||
## Docs: https://mariadb.com/docs/reference/cs10.2/
|
## Docs: https://mariadb.com/docs/reference/cs10.2/
|
||||||
|
@ -74,10 +78,10 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: photoprism
|
MYSQL_DATABASE: "photoprism"
|
||||||
MYSQL_USER: photoprism
|
MYSQL_USER: "photoprism"
|
||||||
MYSQL_PASSWORD: photoprism
|
MYSQL_PASSWORD: "photoprism"
|
||||||
MYSQL_DATABASE: photoprism
|
MYSQL_ROOT_PASSWORD: "photoprism"
|
||||||
|
|
||||||
## MariaDB 10.1 Database Server
|
## MariaDB 10.1 Database Server
|
||||||
mariadb-10-1:
|
mariadb-10-1:
|
||||||
|
@ -88,10 +92,10 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: photoprism
|
MYSQL_DATABASE: "photoprism"
|
||||||
MYSQL_USER: photoprism
|
MYSQL_USER: "photoprism"
|
||||||
MYSQL_PASSWORD: photoprism
|
MYSQL_PASSWORD: "photoprism"
|
||||||
MYSQL_DATABASE: photoprism
|
MYSQL_ROOT_PASSWORD: "photoprism"
|
||||||
|
|
||||||
## MySQL 8 Database Server
|
## MySQL 8 Database Server
|
||||||
## Docs: https://dev.mysql.com/doc/refman/8.0/en/
|
## Docs: https://dev.mysql.com/doc/refman/8.0/en/
|
||||||
|
@ -103,10 +107,10 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: photoprism
|
MYSQL_DATABASE: "photoprism"
|
||||||
MYSQL_USER: photoprism
|
MYSQL_USER: "photoprism"
|
||||||
MYSQL_PASSWORD: photoprism
|
MYSQL_PASSWORD: "photoprism"
|
||||||
MYSQL_DATABASE: photoprism
|
MYSQL_ROOT_PASSWORD: "photoprism"
|
||||||
|
|
||||||
## Join shared "photoprism-develop" network
|
## Join shared "photoprism-develop" network
|
||||||
networks:
|
networks:
|
||||||
|
|
|
@ -128,9 +128,9 @@ services:
|
||||||
- "go-mod:/go/pkg/mod"
|
- "go-mod:/go/pkg/mod"
|
||||||
|
|
||||||
## MariaDB Database Server
|
## MariaDB Database Server
|
||||||
## Docs: https://mariadb.com/docs/reference/cs10.6/
|
## Docs: https://mariadb.com/docs/reference/
|
||||||
mariadb:
|
mariadb:
|
||||||
image: mariadb:10.6
|
image: mariadb:10.7
|
||||||
command: mysqld --port=4001 --transaction-isolation=READ-COMMITTED --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=512 --innodb-rollback-on-timeout=OFF --innodb-lock-wait-timeout=120
|
command: mysqld --port=4001 --transaction-isolation=READ-COMMITTED --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=512 --innodb-rollback-on-timeout=OFF --innodb-lock-wait-timeout=120
|
||||||
expose:
|
expose:
|
||||||
- "4001"
|
- "4001"
|
||||||
|
@ -139,10 +139,12 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: photoprism
|
MARIADB_AUTO_UPGRADE: "1"
|
||||||
MYSQL_USER: photoprism
|
MARIADB_INITDB_SKIP_TZINFO: "1"
|
||||||
MYSQL_PASSWORD: photoprism
|
MARIADB_DATABASE: "photoprism"
|
||||||
MYSQL_DATABASE: photoprism
|
MARIADB_USER: "photoprism"
|
||||||
|
MARIADB_PASSWORD: "photoprism"
|
||||||
|
MARIADB_ROOT_PASSWORD: "photoprism"
|
||||||
|
|
||||||
## Keycloak OpenID Connect Provider
|
## Keycloak OpenID Connect Provider
|
||||||
## Admin Account: admin / photoprism
|
## Admin Account: admin / photoprism
|
||||||
|
|
|
@ -12,7 +12,7 @@ single-arch ARM64 images (updated and tested less frequently):
|
||||||
|
|
||||||
Stable Release : photoprism/photoprism:arm64
|
Stable Release : photoprism/photoprism:arm64
|
||||||
Development Preview: photoprism/photoprism:preview-arm64
|
Development Preview: photoprism/photoprism:preview-arm64
|
||||||
MariaDB : arm64v8/mariadb:10.6
|
MariaDB : arm64v8/mariadb:10.7
|
||||||
|
|
||||||
If your device meets the system requirements, mostly the same installation instructions
|
If your device meets the system requirements, mostly the same installation instructions
|
||||||
as for regular Linux servers apply:
|
as for regular Linux servers apply:
|
||||||
|
|
|
@ -117,7 +117,7 @@ services:
|
||||||
## If MariaDB gets stuck in a restart loop, this points to a memory or filesystem issue:
|
## If MariaDB gets stuck in a restart loop, this points to a memory or filesystem issue:
|
||||||
## https://docs.photoprism.app/getting-started/troubleshooting/#fatal-server-errors
|
## https://docs.photoprism.app/getting-started/troubleshooting/#fatal-server-errors
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
image: arm64v8/mariadb:10.6 # this mariadb image runs on ARM64-based devices only
|
image: arm64v8/mariadb:10.7 # this mariadb image runs on ARM64-based devices only
|
||||||
security_opt:
|
security_opt:
|
||||||
- seccomp:unconfined
|
- seccomp:unconfined
|
||||||
- apparmor:unconfined
|
- apparmor:unconfined
|
||||||
|
@ -126,10 +126,12 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- "./database:/var/lib/mysql" # important, don't remove
|
- "./database:/var/lib/mysql" # important, don't remove
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: insecure
|
MARIADB_AUTO_UPGRADE: "1"
|
||||||
MYSQL_DATABASE: photoprism
|
MARIADB_INITDB_SKIP_TZINFO: "1"
|
||||||
MYSQL_USER: photoprism
|
MARIADB_DATABASE: "photoprism"
|
||||||
MYSQL_PASSWORD: insecure
|
MARIADB_USER: "photoprism"
|
||||||
|
MARIADB_PASSWORD: "insecure"
|
||||||
|
MARIADB_ROOT_PASSWORD: "insecure"
|
||||||
|
|
||||||
## Watchtower upgrades services automatically (optional)
|
## Watchtower upgrades services automatically (optional)
|
||||||
## see https://docs.photoprism.app/getting-started/updates/#watchtower
|
## see https://docs.photoprism.app/getting-started/updates/#watchtower
|
||||||
|
|
|
@ -188,7 +188,7 @@ services:
|
||||||
## see https://docs.photoprism.app/getting-started/faq/#should-i-use-sqlite-mariadb-or-mysql
|
## see https://docs.photoprism.app/getting-started/faq/#should-i-use-sqlite-mariadb-or-mysql
|
||||||
mariadb:
|
mariadb:
|
||||||
restart: always
|
restart: always
|
||||||
image: mariadb:10.6
|
image: mariadb:10.7
|
||||||
container_name: mariadb
|
container_name: mariadb
|
||||||
security_opt:
|
security_opt:
|
||||||
- seccomp:unconfined
|
- seccomp:unconfined
|
||||||
|
@ -198,10 +198,12 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- "./database:/var/lib/mysql" # important, don't remove
|
- "./database:/var/lib/mysql" # important, don't remove
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: "_admin_password_"
|
MARIADB_AUTO_UPGRADE: "1"
|
||||||
MYSQL_DATABASE: "photoprism"
|
MARIADB_INITDB_SKIP_TZINFO: "1"
|
||||||
MYSQL_USER: "photoprism"
|
MARIADB_DATABASE: "photoprism"
|
||||||
MYSQL_PASSWORD: "_admin_password_"
|
MARIADB_USER: "photoprism"
|
||||||
|
MARIADB_PASSWORD: "_admin_password_"
|
||||||
|
MARIADB_ROOT_PASSWORD: "_admin_password_"
|
||||||
|
|
||||||
## Ofelia Job Runner (recommended)
|
## Ofelia Job Runner (recommended)
|
||||||
## see https://github.com/mcuadros/ofelia
|
## see https://github.com/mcuadros/ofelia
|
||||||
|
|
|
@ -118,7 +118,7 @@ services:
|
||||||
## If MariaDB gets stuck in a restart loop, this points to a memory or filesystem issue:
|
## If MariaDB gets stuck in a restart loop, this points to a memory or filesystem issue:
|
||||||
## https://docs.photoprism.app/getting-started/troubleshooting/#fatal-server-errors
|
## https://docs.photoprism.app/getting-started/troubleshooting/#fatal-server-errors
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
image: mariadb:10.6
|
image: mariadb:10.7
|
||||||
security_opt:
|
security_opt:
|
||||||
- seccomp:unconfined
|
- seccomp:unconfined
|
||||||
- apparmor:unconfined
|
- apparmor:unconfined
|
||||||
|
@ -127,10 +127,12 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- "./database:/var/lib/mysql" # important, don't remove
|
- "./database:/var/lib/mysql" # important, don't remove
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: insecure
|
MARIADB_AUTO_UPGRADE: "1"
|
||||||
MYSQL_DATABASE: photoprism
|
MARIADB_INITDB_SKIP_TZINFO: "1"
|
||||||
MYSQL_USER: photoprism
|
MARIADB_DATABASE: "photoprism"
|
||||||
MYSQL_PASSWORD: insecure
|
MARIADB_USER: "photoprism"
|
||||||
|
MARIADB_PASSWORD: "insecure"
|
||||||
|
MARIADB_ROOT_PASSWORD: "insecure"
|
||||||
|
|
||||||
## Watchtower upgrades services automatically (optional)
|
## Watchtower upgrades services automatically (optional)
|
||||||
## see https://docs.photoprism.app/getting-started/updates/#watchtower
|
## see https://docs.photoprism.app/getting-started/updates/#watchtower
|
||||||
|
|
|
@ -90,7 +90,7 @@ services:
|
||||||
## see https://docs.photoprism.app/getting-started/faq/#should-i-use-sqlite-mariadb-or-mysql
|
## see https://docs.photoprism.app/getting-started/faq/#should-i-use-sqlite-mariadb-or-mysql
|
||||||
mariadb:
|
mariadb:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
image: mariadb:10.6
|
image: mariadb:10.7
|
||||||
security_opt:
|
security_opt:
|
||||||
- seccomp:unconfined
|
- seccomp:unconfined
|
||||||
- apparmor:unconfined
|
- apparmor:unconfined
|
||||||
|
@ -100,10 +100,12 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- "database:/var/lib/mysql" # important, don't remove; named volume "database" is defined at the bottom
|
- "database:/var/lib/mysql" # important, don't remove; named volume "database" is defined at the bottom
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: insecure
|
MARIADB_AUTO_UPGRADE: "1"
|
||||||
MYSQL_DATABASE: photoprism
|
MARIADB_INITDB_SKIP_TZINFO: "1"
|
||||||
MYSQL_USER: photoprism
|
MARIADB_DATABASE: "photoprism"
|
||||||
MYSQL_PASSWORD: insecure
|
MARIADB_USER: "photoprism"
|
||||||
|
MARIADB_PASSWORD: "insecure"
|
||||||
|
MARIADB_ROOT_PASSWORD: "insecure"
|
||||||
|
|
||||||
## Watchtower upgrades services automatically (optional)
|
## Watchtower upgrades services automatically (optional)
|
||||||
## see https://docs.photoprism.app/getting-started/updates/#watchtower
|
## see https://docs.photoprism.app/getting-started/updates/#watchtower
|
||||||
|
|
|
@ -103,7 +103,7 @@ services:
|
||||||
## see https://docs.photoprism.app/getting-started/faq/#should-i-use-sqlite-mariadb-or-mysql
|
## see https://docs.photoprism.app/getting-started/faq/#should-i-use-sqlite-mariadb-or-mysql
|
||||||
mariadb:
|
mariadb:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
image: mariadb:10.6
|
image: mariadb:10.7
|
||||||
container_name: mariadb
|
container_name: mariadb
|
||||||
security_opt:
|
security_opt:
|
||||||
- seccomp:unconfined
|
- seccomp:unconfined
|
||||||
|
@ -113,10 +113,12 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- "./database:/var/lib/mysql" # important, don't remove
|
- "./database:/var/lib/mysql" # important, don't remove
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: insecure
|
MARIADB_AUTO_UPGRADE: "1"
|
||||||
MYSQL_DATABASE: photoprism
|
MARIADB_INITDB_SKIP_TZINFO: "1"
|
||||||
MYSQL_USER: photoprism
|
MARIADB_DATABASE: "photoprism"
|
||||||
MYSQL_PASSWORD: insecure
|
MARIADB_USER: "photoprism"
|
||||||
|
MARIADB_PASSWORD: "insecure"
|
||||||
|
MARIADB_ROOT_PASSWORD: "insecure"
|
||||||
|
|
||||||
## Ofelia Job Runner (recommended for running background jobs)
|
## Ofelia Job Runner (recommended for running background jobs)
|
||||||
## see https://github.com/mcuadros/ofelia
|
## see https://github.com/mcuadros/ofelia
|
||||||
|
|
|
@ -96,7 +96,7 @@ services:
|
||||||
## If MariaDB gets stuck in a restart loop, this points to a memory or filesystem issue:
|
## If MariaDB gets stuck in a restart loop, this points to a memory or filesystem issue:
|
||||||
## https://docs.photoprism.app/getting-started/troubleshooting/#fatal-server-errors
|
## https://docs.photoprism.app/getting-started/troubleshooting/#fatal-server-errors
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
image: mariadb:10.6
|
image: mariadb:10.7
|
||||||
security_opt:
|
security_opt:
|
||||||
- seccomp:unconfined
|
- seccomp:unconfined
|
||||||
- apparmor:unconfined
|
- apparmor:unconfined
|
||||||
|
@ -106,10 +106,12 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- "database:/var/lib/mysql" # important, don't remove; named volume "database" is defined at the bottom
|
- "database:/var/lib/mysql" # important, don't remove; named volume "database" is defined at the bottom
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: insecure
|
MARIADB_AUTO_UPGRADE: "1"
|
||||||
MYSQL_DATABASE: photoprism
|
MARIADB_INITDB_SKIP_TZINFO: "1"
|
||||||
MYSQL_USER: photoprism
|
MARIADB_DATABASE: "photoprism"
|
||||||
MYSQL_PASSWORD: insecure
|
MARIADB_USER: "photoprism"
|
||||||
|
MARIADB_PASSWORD: "insecure"
|
||||||
|
MARIADB_ROOT_PASSWORD: "insecure"
|
||||||
|
|
||||||
## Watchtower upgrades services automatically (optional)
|
## Watchtower upgrades services automatically (optional)
|
||||||
## see https://docs.photoprism.app/getting-started/updates/#watchtower
|
## see https://docs.photoprism.app/getting-started/updates/#watchtower
|
||||||
|
|
Loading…
Reference in a new issue