luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Docker: Add security_opt, otherwise MariaDB v10.8 may fail #2390

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2022-07-23 21:43:08 +02:00
parent f4e7081196
commit b9ca7c2d6c
6 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docker-compose.ci.yml
View file

@ -143,6 +143,9 @@ services:
## Docs: https://mariadb.com/docs/reference/ ## Docs: https://mariadb.com/docs/reference/
mariadb: mariadb:
image: mariadb:10.8 image: mariadb:10.8
security_opt: # see https://github.com/MariaDB/mariadb-docker/issues/434#issuecomment-1136151239
- seccomp:unconfined
- apparmor:unconfined
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: 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: expose:
- "4001" # database port (internal) - "4001" # database port (internal)

3
docker-compose.mariadb.yml
View file

@ -7,6 +7,9 @@ services:
## Docs: https://mariadb.com/kb/en/release-notes-mariadb-108-series/ ## Docs: https://mariadb.com/kb/en/release-notes-mariadb-108-series/
mariadb-10-8: mariadb-10-8:
image: mariadb:10.8 image: mariadb:10.8
security_opt: # see https://github.com/MariaDB/mariadb-docker/issues/434#issuecomment-1136151239
- seccomp:unconfined
- apparmor:unconfined
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: 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: expose:
- "4001" - "4001"

3
docker-compose.yml
View file

@ -107,6 +107,9 @@ services:
## Docs: https://mariadb.com/docs/reference/ ## Docs: https://mariadb.com/docs/reference/
mariadb: mariadb:
image: mariadb:10.8 image: mariadb:10.8
security_opt: # see https://github.com/MariaDB/mariadb-docker/issues/434#issuecomment-1136151239
- seccomp:unconfined
- apparmor:unconfined
command: mysqld --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: mysqld --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: expose:
- "4001" - "4001"

2
docker/examples/docker-compose.yml
View file

@ -117,7 +117,7 @@ services:
## 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.8 image: mariadb:10.8
security_opt: security_opt: # see https://github.com/MariaDB/mariadb-docker/issues/434#issuecomment-1136151239
- seccomp:unconfined - seccomp:unconfined
- apparmor:unconfined - apparmor:unconfined
command: mysqld --innodb-buffer-pool-size=512M --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 --innodb-buffer-pool-size=512M --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

2
docker/examples/macos/docker-compose.yml
View file

@ -91,7 +91,7 @@ services:
mariadb: mariadb:
restart: unless-stopped restart: unless-stopped
image: mariadb:10.8 image: mariadb:10.8
security_opt: security_opt: # see https://github.com/MariaDB/mariadb-docker/issues/434#issuecomment-1136151239
- seccomp:unconfined - seccomp:unconfined
- apparmor:unconfined - apparmor:unconfined
## --lower-case-table-names=1 stores tables in lowercase and compares names in a case-insensitive manner ## --lower-case-table-names=1 stores tables in lowercase and compares names in a case-insensitive manner

2
docker/examples/windows/docker-compose.yml
View file

@ -97,7 +97,7 @@ services:
## 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.8 image: mariadb:10.8
security_opt: security_opt: # see https://github.com/MariaDB/mariadb-docker/issues/434#issuecomment-1136151239
- seccomp:unconfined - seccomp:unconfined
- apparmor:unconfined - apparmor:unconfined
## --lower-case-table-names=1 stores tables in lowercase and compares names in a case-insensitive manner ## --lower-case-table-names=1 stores tables in lowercase and compares names in a case-insensitive manner