Implement external volumes

Fixes webdevops/php-docker-boilerplate#67
webdevops · Oct 15, 2017 · dea6208 · dea6208
1 parent b3600b9
commit dea6208
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 71 deletions.
diff --git a/docker-compose.development-reverse-proxy.yml b/docker-compose.development-reverse-proxy.yml
@@ -23,8 +23,6 @@ services:
     volumes:
       - ./app/:/app/
       - ./:/docker/
-    volumes_from:
-      - storage
     # cap and privileged needed for slowlog
     cap_add:
       - SYS_PTRACE
@@ -54,8 +52,8 @@ services:
       #dockerfile: Percona-5.7.Dockerfile
     #ports:
     #  - 13306:3306
-    volumes_from:
-      - storage
+    volumes:
+      - mysql:/var/lib/mysql
     env_file:
       - etc/environment.yml
       - etc/environment.development.yml
@@ -70,8 +68,8 @@ services:
   #    dockerfile: Postgres-9.5.Dockerfile
   #  ports:
   #    - 15432:5432
-  #  volumes_from:
-  #    - storage
+  #  volumes:
+  #    - postgres:/var/lib/postgresql/data
   #  env_file:
   #    - etc/environment.yml
   #    - etc/environment.development.yml
@@ -84,6 +82,8 @@ services:
   #  image: webdevops/typo3-solr:5.0
   #  image: webdevops/typo3-solr:4.0
   #  image: webdevops/typo3-solr:3.1
+  #  volumes:
+  #    - solr:/opt/solr/server/solr/data
   #  env_file:
   #    - etc/environment.yml
   #    - etc/environment.development.yml
@@ -100,8 +100,8 @@ services:
   #  ports:
   #    - 19200:9200
   #    - 19300:9300
-  #  volumes_from:
-  #    - storage
+  #  volumes:
+  #    - elasticsearch:/usr/share/elasticsearch/data
   #  env_file:
   #    - etc/environment.yml
   #    - etc/environment.development.yml
@@ -115,8 +115,8 @@ services:
   #redis:
   #  build:
   #    context: docker/redis/
-  #  volumes_from:
-  #    - storage
+  #  volumes:
+  #    - redis:/data
   #  env_file:
   #    - etc/environment.yml
   #    - etc/environment.development.yml
@@ -127,8 +127,6 @@ services:
   #memcached:
   #  build:
   #    context: docker/memcached/
-  #  volumes_from:
-  #    - storage
   #  env_file:
   #    - etc/environment.yml
   #    - etc/environment.development.yml
@@ -166,8 +164,6 @@ services:
   #ftp:
   #  build:
   #    context: docker/vsftpd/
-  #  volumes_from:
-  #    - storage
   #  volumes:
   #    - ./:/application/
   #  env_file:
@@ -186,13 +182,12 @@ services:
   #    - VIRTUAL_HOST=pma.boilerplate.docker
   #    - VIRTUAL_PORT=80
   #  volumes:
-  #    - /sessions
+  #    - phpmyadmin:/sessions
 
-  #######################################
-  # Storage
-  #######################################
-  storage:
-    build:
-      context: docker/storage/
-    volumes:
-      - /storage
+volumes:
+  mysql:
+  postgres:
+  solr:
+  elasticsearch:
+  redis:
+  phpmyadmin:
diff --git a/docker-compose.development.yml b/docker-compose.development.yml
@@ -23,8 +23,6 @@ services:
     volumes:
       - ./app/:/app/
       - ./:/docker/
-    volumes_from:
-      - storage
     # cap and privileged needed for slowlog
     cap_add:
       - SYS_PTRACE
@@ -54,8 +52,8 @@ services:
       #dockerfile: Percona-5.7.Dockerfile
     ports:
       - 13306:3306
-    volumes_from:
-      - storage
+    volumes:
+      - mysql:/var/lib/mysql
     env_file:
       - etc/environment.yml
       - etc/environment.development.yml
@@ -70,8 +68,8 @@ services:
   #    dockerfile: Postgres-9.5.Dockerfile
   #  ports:
   #    - 15432:5432
-  #  volumes_from:
-  #    - storage
+  #  volumes:
+  #    - postgres:/var/lib/postgresql/data
   #  env_file:
   #    - etc/environment.yml
   #    - etc/environment.development.yml
@@ -84,8 +82,8 @@ services:
   #  image: webdevops/typo3-solr:5.0
   #  image: webdevops/typo3-solr:4.0
   #  image: webdevops/typo3-solr:3.1
-  #  ports:
-  #    - 18983:8983
+  #  volumes:
+  #    - solr:/opt/solr/server/solr/data
   #  env_file:
   #    - etc/environment.yml
   #    - etc/environment.development.yml
@@ -111,8 +109,8 @@ services:
   #  ports:
   #    - 19200:9200
   #    - 19300:9300
-  #  volumes_from:
-  #    - storage
+  #  volumes:
+  #    - elasticsearch:/usr/share/elasticsearch/data
   #  env_file:
   #    - etc/environment.yml
   #    - etc/environment.development.yml
@@ -126,8 +124,8 @@ services:
   #redis:
   #  build:
   #    context: docker/redis/
-  #  volumes_from:
-  #    - storage
+  #  volumes:
+  #    - redis:/data
   #  env_file:
   #    - etc/environment.yml
   #    - etc/environment.development.yml
@@ -138,8 +136,6 @@ services:
   #memcached:
   #  build:
   #    context: docker/memcached/
-  #  volumes_from:
-  #    - storage
   #  env_file:
   #    - etc/environment.yml
   #    - etc/environment.development.yml
@@ -177,8 +173,6 @@ services:
   #ftp:
   #  build:
   #    context: docker/vsftpd/
-  #  volumes_from:
-  #    - storage
   #  volumes:
   #    - ./:/application/
   #  env_file:
@@ -197,13 +191,12 @@ services:
   #    - VIRTUAL_HOST=pma.boilerplate.docker
   #    - VIRTUAL_PORT=80
   #  volumes:
-  #    - /sessions
+  #    - phpmyadmin:/sessions
 
-  #######################################
-  # Storage
-  #######################################
-  storage:
-    build:
-      context: docker/storage/
-    volumes:
-      - /storage
+volumes:
+  mysql:
+  postgres:
+  solr:
+  elasticsearch:
+  redis:
+  phpmyadmin:
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
@@ -23,8 +23,6 @@ services:
     restart: always
     volumes:
       - ./app/:/app/
-    volumes_from:
-      - storage
     env_file:
       - etc/environment.yml
       - etc/environment.production.yml
@@ -44,8 +42,8 @@ services:
       #dockerfile: Percona-5.6.Dockerfile
       #dockerfile: Percona-5.7.Dockerfile
     restart: always
-    volumes_from:
-      - storage
+    volumes:
+      - mysql:/var/lib/mysql
     env_file:
       - etc/environment.yml
       - etc/environment.production.yml
@@ -61,8 +59,8 @@ services:
   #  ports:
   #    - 15432:5432
   #  restart: always
-  #  volumes_from:
-  #    - storage
+  #  volumes:
+  #    - solr:/opt/solr/server/solr/data
   #  env_file:
   #    - etc/environment.yml
   #    - etc/environment.production.yml
@@ -78,6 +76,10 @@ services:
   #  ports:
   #    - 18983:8983
   #  restart: always
+  #  volumes:
+  #    - solr:/opt/solr/server/solr/data
+  #  environment:
+  #    - SOLR_STORAGE=/opt/solr/server/solr/data
   #  env_file:
   #    - etc/environment.yml
   #    - etc/environment.production.yml
@@ -92,8 +94,8 @@ services:
   #    - 19200:9200
   #    - 19300:9300
   #  restart: always
-  #  volumes_from:
-  #    - storage
+  #  volumes:
+  #    - elasticsearch:/usr/share/elasticsearch/data
   #  env_file:
   #    - etc/environment.yml
   #    - etc/environment.production.yml
@@ -105,8 +107,8 @@ services:
   #  build:
   #    context: docker/redis/
   #  restart: always
-  #  volumes_from:
-  #    - storage
+  #  volumes:
+  #    - redis:/data
   #  env_file:
   #    - etc/environment.yml
   #    - etc/environment.production.yml
@@ -118,8 +120,6 @@ services:
   #  build:
   #    context: docker/memcached/
   #  restart: always
-  #  volumes_from:
-  #    - storage
   #  env_file:
   #    - etc/environment.yml
   #    - etc/environment.production.yml
@@ -131,20 +131,16 @@ services:
   #  build:
   #    context: docker/vsftp/
   #  restart: always
-  #  volumes_from:
-  #    - storage
   #  volumes:
   #    - ./:/application/
   #  env_file:
   #    - etc/environment.yml
   #    - etc/environment.production.yml
 
-  #######################################
-  # Storage
-  #######################################
-  storage:
-    build:
-      context: docker/storage/
-    restart: always
-    volumes:
-      - /storage
+volumes:
+  mysql:
+  postgres:
+  solr:
+  elasticsearch:
+  redis:
+  phpmyadmin: