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

Docker: Start mysqld with --innodb-rollback-on-timeout=ON and --innodb-lock-wait-timeout=120

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-05-10 22:18:01 +02:00
parent 5a924a46b1
commit 556a0dd38b
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker-compose.travis.yml
View file

@ -44,7 +44,7 @@ services:
photoprism-db:
image: mariadb:10.5
command: mysqld --port=4001 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=1024
command: mysqld --port=4001 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=1024 --innodb-rollback-on-timeout=ON --innodb-lock-wait-timeout=120
expose:
- "4001"
volumes:

2
docker-compose.yml
View file

@ -43,7 +43,7 @@ services:
photoprism-db:
image: mariadb:10.5
command: mysqld --port=4001 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=1024
command: mysqld --port=4001 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=1024 --innodb-rollback-on-timeout=ON --innodb-lock-wait-timeout=120
expose:
- "4001"
ports:

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

@ -58,7 +58,7 @@ services:
# photoprism-db: # Uncomment, if you want to use MariaDB instead of the internal TiDB
# image: mariadb:10.5 # Alternatively mysql:8.0
# restart: unless-stopped
# command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=1024
# command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=1024 --innodb-rollback-on-timeout=ON --innodb-lock-wait-timeout=120
# volumes:
# - "photoprism-database:/var/lib/mysql"
# environment: