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

Upgrade from Mysql 8.0 to MariaDB 10.4

Browse Source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2019-11-07 20:31:50 +01:00
parent 3fedffe21b
commit 49c7fafa87
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker-compose.travis.yml
View File

@ -5,7 +5,7 @@ services:
build: .
image: photoprism/photoprism:develop
depends_on:
- photoprism-mysql
- photoprism-db
command: tail -f /dev/null
volumes:
- "~/.cache/npm:/root/.cache/npm"
@ -34,8 +34,8 @@ services:
CI_BUILD_ID:
CI_JOB_ID:
photoprism-mysql:
image: mysql:8.0.16
photoprism-db:
image: mariadb:10.4.8
command: mysqld --port=4001 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=1024
expose:
- "4001"

6
docker-compose.yml
View File

@ -5,7 +5,7 @@ services:
build: .
image: photoprism/photoprism:develop
depends_on:
- photoprism-mysql
- photoprism-db
ports:
- "2342:2342" # Web Server (PhotoPrism)
- "4000:4000" # Database (MySQL compatible)
@ -31,8 +31,8 @@ services:
PHOTOPRISM_SQL_PASSWORD: "photoprism"
TF_CPP_MIN_LOG_LEVEL: 0
photoprism-mysql:
image: mysql:8.0.16
photoprism-db:
image: mariadb:10.4.8
command: mysqld --port=4001 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=1024
expose:
- "4001"

4
internal/config/test.go
View File

@ -40,7 +40,7 @@ func NewTestParams() *Params {
ImportPath: testDataPath + "/import",
ExportPath: testDataPath + "/export",
DatabaseDriver: "mysql",
DatabaseDsn: "photoprism:photoprism@tcp(photoprism-mysql:4001)/photoprism?parseTime=true",
DatabaseDsn: "photoprism:photoprism@tcp(photoprism-db:4001)/photoprism?parseTime=true",
}
return c
@ -59,7 +59,7 @@ func NewTestParamsError() *Params {
ImportPath: testDataPath + "/import",
ExportPath: testDataPath + "/export",
DatabaseDriver: "mysql",
DatabaseDsn: "photoprism:photoprism@tcp(photoprism-mysql:4001)/photoprism?parseTime=true",
DatabaseDsn: "photoprism:photoprism@tcp(photoprism-db:4001)/photoprism?parseTime=true",
}
return c