Merge branch 'ntr/docker-sync' into '6.1'

Switch to use Docker Volumes, instead of Mount Binds

See merge request shopware/6/product/development!91

.env.dist

@@ -30,5 +30,8 @@ SHOPWARE_ES_INDEX_PREFIX=__SHOPWARE_ES_INDEX_PREFIX__
 
 SHOPWARE_HTTP_CACHE_ENABLED=__SHOPWARE_HTTP_CACHE_ENABLED__
 SHOPWARE_HTTP_DEFAULT_TTL=__SHOPWARE_HTTP_DEFAULT_TTL__
+DOCKER_SYNC_ENABLED=__DOCKER_SYNC_ENABLED__
+USER_ID=__USER_ID__
+GROUP_ID=__GROUP_ID__
 
 __FEATURES__

.gitignore

@@ -35,7 +35,7 @@
 /public/assets/*
 
 /files/*
-
+/.docker-sync/
 /dev-ops/docker/_volumes/*
 /dev-ops/analyze/node_modules
 /dev-ops/analyze/vendor

.psh.yaml.dist

@@ -42,6 +42,7 @@ const:
   SHOPWARE_ES_INDEX_PREFIX: "sw"
   SHOPWARE_HTTP_CACHE_ENABLED: "0"
   SHOPWARE_HTTP_DEFAULT_TTL: 7200
+  DOCKER_SYNC_ENABLED: false
   FEATURES: |
     FEATURE_NEXT_516=1
   DEVPORT: "8080"
@@ -58,11 +59,20 @@ dynamic:
   E2E_ENV: if [ -z "$(grep docker /proc/self/cgroup)" ]; then echo "default"; else echo "docker"; fi
   PROJECT_ROOT: echo `pwd`
   COMPOSER_HOME: echo ${COMPOSER_HOME:-"$HOME/.composer"}
+  DOCKER_APP_VOLUME_MOUNT: echo ".:/app"
+  DOCKER_APP_VOLUMES: echo ""
 
 environments:
   docker:
     paths:
       - "dev-ops/docker/actions"
+    dynamic:
+      DOCKER_APP_VOLUME_MOUNT: |
+        DOCKER_SYNC_ENABLED=$(grep DOCKER_SYNC_ENABLED .env | xargs); DOCKER_SYNC_ENABLED=${DOCKER_SYNC_ENABLED#*=};
+        if [[ ${DOCKER_SYNC_ENABLED} ]]; then echo "app_server:/app:nocopy"; else echo ".:/app"; fi
+      DOCKER_APP_VOLUMES: |
+        DOCKER_SYNC_ENABLED=$(grep DOCKER_SYNC_ENABLED .env | xargs); DOCKER_SYNC_ENABLED=${DOCKER_SYNC_ENABLED#*=};
+        if [[ ${DOCKER_SYNC_ENABLED} ]]; then echo "volumes:\n  app_server:\n    external: true"; else echo ""; fi
     templates:
       - source: ".env.dist"
         destination: ".env"

dev-ops/docker/actions/start.sh

@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
-
 # check that the ~/.npm and ~/.composer folder are not owned by the root user
 dev-ops/docker/scripts/check_permissions.sh
 
-docker-compose build && docker-compose up -d
+# Start docker-sync
+if [[ -n "__DOCKER_SYNC_ENABLED__" ]]; then docker-sync start && echo "\n docker-sync is initially indexing files. It may take some minutes, until code changes take effect"; fi
 
+docker-compose build && docker-compose up -d

dev-ops/docker/actions/stop.sh

@@ -1,3 +1,6 @@
 #!/usr/bin/env bash
 
+# Stop docker-sync
+if [[ -n "__DOCKER_SYNC_ENABLED__" ]]; then docker-sync stop; fi
+
 docker-compose down

dev-ops/docker/docker-compose.override.yml

@@ -3,7 +3,14 @@ version: "3.7"
 
 services:
   app_server:
+    image: shopware/development:local
+    build:
+      context: dev-ops/docker/containers/app
+      args:
+        USER_ID: __USER_ID__
+        GROUP_ID: __GROUP_ID__
     volumes:
+      - __DOCKER_APP_VOLUME_MOUNT__
       - ~/.npm:/.npm
     environment:
       CONTAINER_UID: __USER_ID__
@@ -34,3 +41,5 @@ services:
     ports:
       - "9200:9200"
       - "9300:9300"
+
+__DOCKER_APP_VOLUMES__

docker-compose.yml

@@ -9,7 +9,6 @@ services:
     extra_hosts:
       - "docker.vm:127.0.0.1"
     volumes:
-      - .:/app
       - ~/.composer:/.composer
     tmpfs:
       - /tmp:mode=1777

docker-sync.yml

@@ -0,0 +1,11 @@
+version: "2"
+
+options:
+  max-attempt: 30
+
+syncs:
+  app_server:
+    src: './'
+    sync_excludes: ['.git', '.idea', 'dev-ops/docker/_volumes', 'var', '.docker-sync']
+    sync_userid: $USER_ID
+    sync_groupid: $GROUP_ID