From 6408f0884ede1d3b1050cc402f741afc1875d8cd Mon Sep 17 00:00:00 2001 From: bearns Date: Wed, 14 Oct 2020 16:54:39 +0300 Subject: [PATCH] Volumes to bind notation --- docker-compose.yml | 25 ++++++++++++++++++++++--- docker-compose.yml~ | 3 ++- redmine/Dockerfile | 2 +- redmine/Dockerfile~ | 2 +- 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3a3ffbd..9655a26 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,8 +14,10 @@ services: env_file: - db.env volumes: - - /srv/docker/redmine/redmine_mysql:/usr/src/redmine/files - - /srv/docker/redmine/redmine-logs:/var/log/redmine + - redmine-files:/usr/src/redmine/files + - redmine-logs:/var/log/redmine + depends_on: + - db db: image: mysql:5.7 @@ -26,7 +28,24 @@ services: env_file: - db.env volumes: - - /srv/docker/redmine/mysql:/var/lib/mysql + - db:/var/lib/mysql + +volumes: + db: + driver_opts: + type: none + device: /media/docker/nc-db + o: bind + redmine-files: + driver_opts: + type: none + device: /media/docker/nc-data + o: bind + redmine-logs: + driver_opts: + type: none + device: /media/docker/nc-data + o: bind # openldap: # diff --git a/docker-compose.yml~ b/docker-compose.yml~ index b61125f..5a336a6 100644 --- a/docker-compose.yml~ +++ b/docker-compose.yml~ @@ -16,7 +16,8 @@ services: volumes: - /srv/docker/redmine/redmine_mysql:/usr/src/redmine/files - /srv/docker/redmine/redmine-logs:/var/log/redmine - - /srv/docker/redmine/plugins:/usr/src/redmine/plugins + depends_on: + - db db: image: mysql:5.7 diff --git a/redmine/Dockerfile b/redmine/Dockerfile index 98291bd..bd5412e 100644 --- a/redmine/Dockerfile +++ b/redmine/Dockerfile @@ -1,3 +1,3 @@ -FROM redmine +FROM redmine:latest-alpine ENV REDMINE_DB_PASSWORD=${MYSQL_ROOT_PASSWORD} COPY ./redmine_ldap_passwd/. /usr/share/redmine/plugins/ \ No newline at end of file diff --git a/redmine/Dockerfile~ b/redmine/Dockerfile~ index 7eef143..98291bd 100644 --- a/redmine/Dockerfile~ +++ b/redmine/Dockerfile~ @@ -1,3 +1,3 @@ FROM redmine ENV REDMINE_DB_PASSWORD=${MYSQL_ROOT_PASSWORD} -COPY ./redmine_ldap_passwd/. /usr/share/redmine/plugins/ +COPY ./redmine_ldap_passwd/. /usr/share/redmine/plugins/ \ No newline at end of file