diff --git a/docker-compose.armv7.yml b/docker-compose.armv7.yml index 17a02d934..9632e5726 100644 --- a/docker-compose.armv7.yml +++ b/docker-compose.armv7.yml @@ -93,7 +93,7 @@ services: security_opt: # see https://github.com/MariaDB/mariadb-docker/issues/434#issuecomment-1136151239 - seccomp:unconfined - apparmor:unconfined - command: mariadbd --port=4001 --innodb-strict-mode=1 --innodb-buffer-pool-size=256M --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: --port=4001 --innodb-strict-mode=1 --innodb-buffer-pool-size=256M --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: - "4001" ports: diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 4bdd46af7..3b639d6e7 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -150,7 +150,7 @@ services: security_opt: # see https://github.com/MariaDB/mariadb-docker/issues/434#issuecomment-1136151239 - seccomp:unconfined - apparmor:unconfined - command: mariadbd --port=4001 --innodb-buffer-pool-size=256M --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: --port=4001 --innodb-buffer-pool-size=256M --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: - "4001" # database port (internal) volumes: diff --git a/docker-compose.mariadb.yml b/docker-compose.mariadb.yml index 7e4f3472e..f1140a5ab 100644 --- a/docker-compose.mariadb.yml +++ b/docker-compose.mariadb.yml @@ -4,15 +4,15 @@ version: '3.5' ## Setup: https://docs.photoprism.app/developer-guide/setup/ ## services: - ## MariaDB 11.0 Database Server + ## MariaDB 11.2 Database Server ## Docs: https://mariadb.com/docs/reference/ - ## Release Notes: https://mariadb.com/kb/en/mariadb-11-0-0-release-notes/ - mariadb-11-0: - image: mariadb:11.0-rc + ## Release Notes: https://mariadb.com/kb/en/release-notes-mariadb-11-2-series/ + mariadb-11-2: + image: mariadb:11.2 security_opt: # see https://github.com/MariaDB/mariadb-docker/issues/434#issuecomment-1136151239 - seccomp:unconfined - apparmor:unconfined - command: mariadbd --port=4001 --innodb-strict-mode=1 --innodb-buffer-pool-size=256M --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: --port=4001 --innodb-strict-mode=1 --innodb-buffer-pool-size=256M --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: - "4001" ports: @@ -27,14 +27,14 @@ services: MARIADB_PASSWORD: "photoprism" MARIADB_ROOT_PASSWORD: "photoprism" - ## MariaDB 10.8 Database Server - ## Docs: https://mariadb.com/kb/en/release-notes-mariadb-108-series/ - mariadb-10-8: - image: mariadb:10.8 + ## MariaDB 10.11 Database Server + ## Docs: https://mariadb.com/kb/en/release-notes-mariadb-1011-series/ + mariadb-10-11: + image: mariadb:10.11 security_opt: # see https://github.com/MariaDB/mariadb-docker/issues/434#issuecomment-1136151239 - seccomp:unconfined - apparmor:unconfined - command: mariadbd --port=4001 --innodb-buffer-pool-size=256M --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: --port=4001 --innodb-buffer-pool-size=256M --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: - "4001" ports: @@ -49,28 +49,12 @@ services: MARIADB_PASSWORD: "photoprism" MARIADB_ROOT_PASSWORD: "photoprism" - ## MariaDB 10.7 Database Server - mariadb-10-7: - image: mariadb:10.7 - command: mysqld --port=4001 --innodb-buffer-pool-size=256M --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: - - "4001" # database port (internal) - volumes: - - "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql" - environment: - MARIADB_AUTO_UPGRADE: "1" - MARIADB_INITDB_SKIP_TZINFO: "1" - MARIADB_DATABASE: "photoprism" - MARIADB_USER: "photoprism" - MARIADB_PASSWORD: "photoprism" - MARIADB_ROOT_PASSWORD: "photoprism" - ## MariaDB 10.5.5 Database Server ## Affected by MDEV-25362: Incorrect name resolution for subqueries in ON expressions ## see https://jira.mariadb.org/browse/MDEV-25362 mariadb-10-5-5: image: mariadb:10.5.5 - command: mysqld --port=4001 --innodb-buffer-pool-size=256M --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: --port=4001 --innodb-buffer-pool-size=256M --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: - "4001" # database port (internal) volumes: @@ -100,7 +84,7 @@ services: ## Docs: https://mariadb.com/docs/reference/cs10.2/ mariadb-10-2: image: mariadb:10.2 - command: mysqld --port=4001 --innodb-buffer-pool-size=256M --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: --port=4001 --innodb-buffer-pool-size=256M --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: - "4001" # database port (internal) volumes: @@ -114,7 +98,7 @@ services: ## MariaDB 10.1 Database Server mariadb-10-1: image: mariadb:10.1 - command: mysqld --port=4001 --innodb-buffer-pool-size=256M --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: --port=4001 --innodb-buffer-pool-size=256M --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: - "4001" # database port (internal) volumes: diff --git a/docker-compose.yml b/docker-compose.yml index 0f2102dc5..c9767dcf5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -133,7 +133,7 @@ services: security_opt: # see https://github.com/MariaDB/mariadb-docker/issues/434#issuecomment-1136151239 - seccomp:unconfined - apparmor:unconfined - command: mariadbd --port=4001 --innodb-strict-mode=1 --innodb-buffer-pool-size=256M --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: --port=4001 --innodb-strict-mode=1 --innodb-buffer-pool-size=256M --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: - "4001" ports: