From 0c1f326dc559ac5edf62e3b236b7d80f856c43fc Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Mon, 17 Sep 2018 18:08:46 +0200 Subject: [PATCH] Improved docker-compose configs --- docker-compose.prod.yml | 8 ++++---- docker-compose.yml | 10 +++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 175ddf857..4e96e7c0c 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -6,13 +6,13 @@ services: ports: - 80:80 volumes: - - photo-data:/var/photoprism/photos + - photoprism-photos:/var/photoprism/photos database: image: mysql:latest command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=1024 volumes: - - database-data:/var/lib/mysql + - photoprism-database:/var/lib/mysql environment: MYSQL_ROOT_PASSWORD: photoprism MYSQL_USER: photoprism @@ -20,7 +20,7 @@ services: MYSQL_DATABASE: photoprism volumes: - photo-data: + photoprism-photos: driver: local - database-data: + photoprism-database: driver: local \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 23524e267..5a981f26a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: - 80:80 volumes: - .:/go/src/github.com/photoprism/photoprism - - ./configs/photoprism.dev.yml:/etc/photoprism/photoprism.yml + - ./configs/photoprism.dev.yml:/etc/photoprism/photoprism.yml:ro database: image: mysql:latest @@ -17,13 +17,9 @@ services: ports: - 13306:3306 volumes: - - database-data:/var/lib/mysql + - /var/lib/mysql environment: MYSQL_ROOT_PASSWORD: photoprism MYSQL_USER: photoprism MYSQL_PASSWORD: photoprism - MYSQL_DATABASE: photoprism - -volumes: - database-data: - driver: local \ No newline at end of file + MYSQL_DATABASE: photoprism \ No newline at end of file