Merge pull request #8 from solutionDrive/ISSUE-6-shared-volumes

Changed to more then one volume

Author: michz

bin/runInSdTest.sh

@@ -26,7 +26,7 @@ fi
 PROJECT_DIR="$( dirname $( dirname $( dirname "${PACKAGE_DIR}") ) )"
 PROJECT_NAME="$( basename ${PROJECT_DIR} | tr '[:upper:]' '[:lower:]' )"
 # TODO: Think about a good solution for a different shopware version
-PHP_CONTAINER_NAME="${PROJECT_NAME}_shopware546_php${VERSION}_1"
+PHP_CONTAINER_NAME="${PROJECT_NAME}_shopware54_php${VERSION}_1"
 WORK_DIR=${WORK_DIR:-"/var/www/shopware54_php${VERSION}"}
 
 docker exec --workdir ${WORK_DIR} -it ${PHP_CONTAINER_NAME} ${@:2}

bin/sdTest.sh

@@ -87,7 +87,7 @@ function run_container {
 function start_container {
     prepare
     echo_configuration
-    docker_compose_cmd up --no-start $@
+    docker_compose_cmd up --no-start --remove-orphans $@
     docker_compose_cmd start $@
 }
 

docker-compose.yml

@@ -12,29 +12,31 @@ services:
       - "10871:10871"
       - "10872:10872"
     volumes:
-      - shared_www:/var/www:delegated
+      - shopware54_php72:/var/www/shopware54_php72:delegated
+      - shopware54_php71:/var/www/shopware54_php71:delegated
+      - shopware54_php70:/var/www/shopware54_php70:delegated
       - ${PROJECT_DIR}:/opt/host:delegated
       - ./nginx/nginx.conf:/etc/nginx/nginx.conf
       - ./nginx/include.shopware.conf:/etc/nginx/include.shopware.conf
       - ./nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
     links:
-      - shopware546_php72
-      - shopware546_php71
-      - shopware546_php70
+      - shopware54_php72
+      - shopware54_php71
+      - shopware54_php70
       - mysql
     depends_on:
-      - shopware546_php72
-      - shopware546_php71
-      - shopware546_php70
+      - shopware54_php72
+      - shopware54_php71
+      - shopware54_php70
 
-  shopware546_php72:
+  shopware54_php72:
     image: solutiondrive/docker-shopware-container:shopware5.4.6-php7.2
     environment:
     - TZ=Europe/Berlin
     - DB_DATABASE=shopware54_php72
     - WEB_HOST=localhost:10872
     volumes:
-    - shared_www:/var/www:delegated
+    - shopware54_php72:/var/www/shopware54_php72:delegated
     - ${PROJECT_DIR}:/opt/host:delegated
     - ./php/php.ini:/usr/local/etc/php/conf.d/zzz-override-php.ini
     - ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
@@ -43,14 +45,14 @@ services:
     depends_on:
     - mysql
 
-  shopware546_php71:
+  shopware54_php71:
     image: solutiondrive/docker-shopware-container:shopware5.4.6-php7.1
     environment:
     - TZ=Europe/Berlin
     - DB_DATABASE=shopware54_php71
     - WEB_HOST=localhost:10871
     volumes:
-    - shared_www:/var/www:delegated
+    - shopware54_php71:/var/www/shopware54_php71:delegated
     - ${PROJECT_DIR}:/opt/host:delegated
     - ./php/php.ini:/usr/local/etc/php/conf.d/zzz-override-php.ini
     - ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
@@ -59,14 +61,14 @@ services:
     depends_on:
     - mysql
 
-  shopware546_php70:
+  shopware54_php70:
     image: solutiondrive/docker-shopware-container:shopware5.4.6-php7.0
     environment:
     - TZ=Europe/Berlin
     - DB_DATABASE=shopware54_php70
     - WEB_HOST=localhost:10870
     volumes:
-    - shared_www:/var/www:delegated
+    - shopware54_php70:/var/www/shopware54_php70:delegated
     - ${PROJECT_DIR}:/opt/host:delegated
     - ./php/php.ini:/usr/local/etc/php/conf.d/zzz-override-php.ini
     - ./php/www.conf:/usr/local/etc/php-fpm.d/www.conf
@@ -85,4 +87,6 @@ services:
       - "10331:3306"
 
 volumes:
-  shared_www:
+  shopware54_php72:
+  shopware54_php71:
+  shopware54_php70:

nginx/conf.d/default.conf

@@ -4,7 +4,7 @@ server {
 
     #access_log /var/logs/nginx_access.log;
     root /var/www/shopware54_php72;
-    set $fastcgi_pass shopware546_php72:9000;
+    set $fastcgi_pass shopware54_php72:9000;
 
     include /etc/nginx/include.shopware.conf;
 }
@@ -15,7 +15,7 @@ server {
 
     #access_log /var/logs/nginx_access.log;
     root /var/www/shopware54_php71;
-    set $fastcgi_pass shopware546_php71:9000;
+    set $fastcgi_pass shopware54_php71:9000;
 
     include /etc/nginx/include.shopware.conf;
 }
@@ -26,7 +26,7 @@ server {
 
     #access_log /var/logs/nginx_access.log;
     root /var/www/shopware54_php70;
-    set $fastcgi_pass shopware546_php70:9000;
+    set $fastcgi_pass shopware54_php70:9000;
 
     include /etc/nginx/include.shopware.conf;
 }