Develop: Move MySQL 8 to docker-compose.mariadb.yml
This commit is contained in:
parent
2adfc3ee72
commit
2e0c40332c
|
@ -38,7 +38,7 @@ services:
|
||||||
PHOTOPRISM_DATABASE_PASSWORD: "photoprism"
|
PHOTOPRISM_DATABASE_PASSWORD: "photoprism"
|
||||||
PHOTOPRISM_TEST_DRIVER: "sqlite"
|
PHOTOPRISM_TEST_DRIVER: "sqlite"
|
||||||
PHOTOPRISM_TEST_DSN: ".test.db"
|
PHOTOPRISM_TEST_DSN: ".test.db"
|
||||||
PHOTOPRISM_TEST_DSN_MYSQL8: "root:photoprism@tcp(mysql:4001)/photoprism?charset=utf8mb4,utf8&collation=utf8mb4_unicode_ci&parseTime=true"
|
# PHOTOPRISM_TEST_DSN_MYSQL8: "root:photoprism@tcp(mysql:4001)/photoprism?charset=utf8mb4,utf8&collation=utf8mb4_unicode_ci&parseTime=true"
|
||||||
PHOTOPRISM_ADMIN_PASSWORD: "photoprism" # The initial admin password (min 4 characters)
|
PHOTOPRISM_ADMIN_PASSWORD: "photoprism" # The initial admin password (min 4 characters)
|
||||||
PHOTOPRISM_ASSETS_PATH: "/go/src/github.com/photoprism/photoprism/assets"
|
PHOTOPRISM_ASSETS_PATH: "/go/src/github.com/photoprism/photoprism/assets"
|
||||||
PHOTOPRISM_STORAGE_PATH: "/go/src/github.com/photoprism/photoprism/storage"
|
PHOTOPRISM_STORAGE_PATH: "/go/src/github.com/photoprism/photoprism/storage"
|
||||||
|
|
|
@ -76,6 +76,21 @@ services:
|
||||||
MYSQL_PASSWORD: photoprism
|
MYSQL_PASSWORD: photoprism
|
||||||
MYSQL_DATABASE: photoprism
|
MYSQL_DATABASE: photoprism
|
||||||
|
|
||||||
|
## MySQL 8 Database Server
|
||||||
|
## Docs: https://dev.mysql.com/doc/refman/8.0/en/
|
||||||
|
mysql:
|
||||||
|
image: mysql:8
|
||||||
|
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:
|
||||||
|
- "4001" # Database port (internal)
|
||||||
|
volumes:
|
||||||
|
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
||||||
|
environment:
|
||||||
|
MYSQL_ROOT_PASSWORD: photoprism
|
||||||
|
MYSQL_USER: photoprism
|
||||||
|
MYSQL_PASSWORD: photoprism
|
||||||
|
MYSQL_DATABASE: photoprism
|
||||||
|
|
||||||
## Join shared "photoprism-develop" network
|
## Join shared "photoprism-develop" network
|
||||||
networks:
|
networks:
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -73,7 +73,7 @@ services:
|
||||||
PHOTOPRISM_DATABASE_PASSWORD: "photoprism"
|
PHOTOPRISM_DATABASE_PASSWORD: "photoprism"
|
||||||
PHOTOPRISM_TEST_DRIVER: "sqlite"
|
PHOTOPRISM_TEST_DRIVER: "sqlite"
|
||||||
PHOTOPRISM_TEST_DSN: ".test.db"
|
PHOTOPRISM_TEST_DSN: ".test.db"
|
||||||
PHOTOPRISM_TEST_DSN_MYSQL8: "root:photoprism@tcp(mysql:4001)/photoprism?charset=utf8mb4,utf8&collation=utf8mb4_unicode_ci&parseTime=true"
|
# PHOTOPRISM_TEST_DSN_MYSQL8: "root:photoprism@tcp(mysql:4001)/photoprism?charset=utf8mb4,utf8&collation=utf8mb4_unicode_ci&parseTime=true"
|
||||||
PHOTOPRISM_ASSETS_PATH: "/go/src/github.com/photoprism/photoprism/assets"
|
PHOTOPRISM_ASSETS_PATH: "/go/src/github.com/photoprism/photoprism/assets"
|
||||||
PHOTOPRISM_STORAGE_PATH: "/go/src/github.com/photoprism/photoprism/storage"
|
PHOTOPRISM_STORAGE_PATH: "/go/src/github.com/photoprism/photoprism/storage"
|
||||||
PHOTOPRISM_ORIGINALS_PATH: "/go/src/github.com/photoprism/photoprism/storage/originals"
|
PHOTOPRISM_ORIGINALS_PATH: "/go/src/github.com/photoprism/photoprism/storage/originals"
|
||||||
|
@ -136,21 +136,6 @@ services:
|
||||||
MYSQL_PASSWORD: photoprism
|
MYSQL_PASSWORD: photoprism
|
||||||
MYSQL_DATABASE: photoprism
|
MYSQL_DATABASE: photoprism
|
||||||
|
|
||||||
## MySQL Database Server
|
|
||||||
## Docs: https://dev.mysql.com/doc/refman/8.0/en/
|
|
||||||
mysql:
|
|
||||||
image: mysql:8
|
|
||||||
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:
|
|
||||||
- "4001" # Database port (internal)
|
|
||||||
volumes:
|
|
||||||
- "./scripts/sql/mariadb-init.sql:/docker-entrypoint-initdb.d/init.sql"
|
|
||||||
environment:
|
|
||||||
MYSQL_ROOT_PASSWORD: photoprism
|
|
||||||
MYSQL_USER: photoprism
|
|
||||||
MYSQL_PASSWORD: photoprism
|
|
||||||
MYSQL_DATABASE: photoprism
|
|
||||||
|
|
||||||
## Keycloak OpenID Connect Provider
|
## Keycloak OpenID Connect Provider
|
||||||
## Test User: user / photoprism
|
## Test User: user / photoprism
|
||||||
## Test Admin: admin / photoprism
|
## Test Admin: admin / photoprism
|
||||||
|
|
|
@ -9,9 +9,13 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestMySQL8(t *testing.T) {
|
func TestMySQL8(t *testing.T) {
|
||||||
dbDriver := MySQL
|
|
||||||
dbDsn := os.Getenv("PHOTOPRISM_TEST_DSN_MYSQL8")
|
dbDsn := os.Getenv("PHOTOPRISM_TEST_DSN_MYSQL8")
|
||||||
|
|
||||||
|
if dbDsn == "" {
|
||||||
|
t.Skip("skipping MySQL 8 test: PHOTOPRISM_TEST_DSN_MYSQL8 is not set")
|
||||||
|
}
|
||||||
|
|
||||||
|
dbDriver := MySQL
|
||||||
db, err := gorm.Open(dbDriver, dbDsn)
|
db, err := gorm.Open(dbDriver, dbDsn)
|
||||||
|
|
||||||
if err != nil || db == nil {
|
if err != nil || db == nil {
|
||||||
|
|
Loading…
Reference in a new issue