Improved docker-compose configs

This commit is contained in:
Michael Mayer 2018-09-17 18:08:46 +02:00
parent 5beb8e38ca
commit 0c1f326dc5
2 changed files with 7 additions and 11 deletions

View file

@ -6,13 +6,13 @@ services:
ports: ports:
- 80:80 - 80:80
volumes: volumes:
- photo-data:/var/photoprism/photos - photoprism-photos:/var/photoprism/photos
database: database:
image: mysql:latest image: mysql:latest
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
volumes: volumes:
- database-data:/var/lib/mysql - photoprism-database:/var/lib/mysql
environment: environment:
MYSQL_ROOT_PASSWORD: photoprism MYSQL_ROOT_PASSWORD: photoprism
MYSQL_USER: photoprism MYSQL_USER: photoprism
@ -20,7 +20,7 @@ services:
MYSQL_DATABASE: photoprism MYSQL_DATABASE: photoprism
volumes: volumes:
photo-data: photoprism-photos:
driver: local driver: local
database-data: photoprism-database:
driver: local driver: local

View file

@ -9,7 +9,7 @@ services:
- 80:80 - 80:80
volumes: volumes:
- .:/go/src/github.com/photoprism/photoprism - .:/go/src/github.com/photoprism/photoprism
- ./configs/photoprism.dev.yml:/etc/photoprism/photoprism.yml - ./configs/photoprism.dev.yml:/etc/photoprism/photoprism.yml:ro
database: database:
image: mysql:latest image: mysql:latest
@ -17,13 +17,9 @@ services:
ports: ports:
- 13306:3306 - 13306:3306
volumes: volumes:
- database-data:/var/lib/mysql - /var/lib/mysql
environment: environment:
MYSQL_ROOT_PASSWORD: photoprism MYSQL_ROOT_PASSWORD: photoprism
MYSQL_USER: photoprism MYSQL_USER: photoprism
MYSQL_PASSWORD: photoprism MYSQL_PASSWORD: photoprism
MYSQL_DATABASE: photoprism MYSQL_DATABASE: photoprism
volumes:
database-data:
driver: local