Refetch unison port number in case it changes after a container restart.

Author: Alan Kent

README.md

@@ -352,6 +352,7 @@ laptop batteries. To manually trigger background index updates, run `magento
 cron:run` twice in a row (sometimes the first cron schedules jobs for the
 second cron to run).
 
+    cd /var/www/magento2
     magento cron:run
     magento cron:run
 
@@ -473,6 +474,8 @@ Magento 2.2 onwards.
 
 To turn on usage of Redis for session caching, run
 
+    cd /var/www/magento2
+    rm var/session/*
     magento setup:config:set --session-save=redis --session-save-redis-host=redis --session-save-redis-log-level=3 --session-save-redis-timeout=10
 
 To turn on usage of Redis for default data caching, run
@@ -554,15 +557,23 @@ directory).
 Next, add a repository reference to all the directories containing packages
 (that is, all directories containing a `composer.json` file). You may use `*`
 in path wildcards to include multiple directories at a time. Make sure you use
-quotes to make sure the shell does not expand the wildcards.
+quotes to make sure the shell does not expand the wildcards. (The wildcard will
+match directories such as modules in `app/code/Magento/*` and themes in
+`app/design/MyVendor/*`.)
+
+    composer config repositories.myrepo path "../myrepo/app/*/*/*"
+
+If developing a module, set the minimum stability to `dev` (and set it back to
+a stable level when going live). See the Composer documentation for more
+options.
 
-    composer config repositories.myrepo path "../myrepo/app/*/myvendor/*"
+    composer config minimum-stability dev
 
 You can then add dependencies to any of the packages in the specified
 directories. Composer will create a symlink from under the `vendor/myvendor`
 directory to the appropriate git repository directory.
 
-    composer require myvendor/module-mymodule:*
+    composer require "myvendor/module-mymodule:*"
 
 Note that while Unison will not sync the symlink, if you specify the
 `shared/www` local directory as the "source code root" in PHP Storm, it will

m2unison.bat

@@ -16,12 +16,7 @@ REM Add Windows\system32 to start of path to find the right "timeout" command
 REM Cygwin can end up with 'unix like' timeout in path instead otherwise
 PATH C:\Windows\System32;%PATH%
 
-REM Fetch the external Docker Unison port number
-FOR /f "delims=" %%A IN ('docker-compose port web 5000') DO SET "CMD_OUTPUT=%%A"
-FOR /f "tokens=1,* delims=:" %%A IN ("%CMD_OUTPUT%") DO SET "UNISON_PORT=%%B"
-
 @SET LOCAL_ROOT=./shared/www
-@SET REMOTE_ROOT=socket://localhost:%UNISON_PORT%//var/www
 
 @SET IGNORE=
 
@@ -34,8 +29,6 @@ REM Magento files not worth pulling locally.
 @SET IGNORE=%IGNORE% -ignore "Path magento2/var/tmp"
 @SET IGNORE=%IGNORE% -ignore "Path magento2/var/.setup_cronjob_status"
 @SET IGNORE=%IGNORE% -ignore "Path magento2/var/.update_cronjob_status"
-@SET IGNORE=%IGNORE% -ignore "Path magento2/pub/media"
-@SET IGNORE=%IGNORE% -ignore "Path magento2/pub/static"
 
 REM Other files not worth pushing to the container.
 @SET IGNORE=%IGNORE% -ignore "Path magento2/.git"
@@ -46,6 +39,11 @@ REM Other files not worth pushing to the container.
 @SET IGNORE=%IGNORE% -ignore "Name {.*.swp}"
 @SET IGNORE=%IGNORE% -ignore "Name {.unison.*}"
 
+REM Fetch the external Docker Unison port number
+FOR /f "delims=" %%A IN ('docker-compose port web 5000') DO SET "CMD_OUTPUT=%%A"
+FOR /f "tokens=1,* delims=:" %%A IN ("%CMD_OUTPUT%") DO SET "UNISON_PORT=%%B"
+@SET REMOTE_ROOT=socket://localhost:%UNISON_PORT%//var/www
+
 @set UNISONARGS=%LOCAL_ROOT% %REMOTE_ROOT% -prefer %LOCAL_ROOT% -preferpartial "Path var -> %REMOTE_ROOT%" -auto -batch %IGNORE%
 
 IF NOT EXIST  %LOCAL_ROOT%/magento2/vendor (
@@ -57,6 +55,14 @@ REM **** Entering file watch mode ****
 :loop_sync
     .\unison %UNISONARGS% -repeat watch
     TIMEOUT 5
+
+    REM Re-fetch the external Docker Unison port number in case it changed.
+    FOR /f "delims=" %%A IN ('docker-compose port web 5000') DO SET "CMD_OUTPUT=%%A"
+    FOR /f "tokens=1,* delims=:" %%A IN ("%CMD_OUTPUT%") DO SET "UNISON_PORT=%%B"
+    @SET REMOTE_ROOT=socket://localhost:%UNISON_PORT%//var/www
+
+    @set UNISONARGS=%LOCAL_ROOT% %REMOTE_ROOT% -prefer %LOCAL_ROOT% -preferpartial "Path var -> %REMOTE_ROOT%" -auto -batch %IGNORE%
+
     @GOTO loop_sync
 
 :exit

m2unison.sh

@@ -12,11 +12,7 @@ if [[ ! -f unison ]]; then
     chmod +x unison unison-fsmonitor
 fi
 
-# Fetch the external Docker Unison port number
-UNISON_PORT=$(docker-compose port web 5000 | awk -F: '{print $2}')
-
 LOCAL_ROOT=./shared/www
-REMOTE_ROOT=socket://localhost:$UNISON_PORT//var/www
 
 IGNORE=
 
@@ -29,8 +25,6 @@ IGNORE="$IGNORE -ignore 'Path magento2/var/session'"
 IGNORE="$IGNORE -ignore 'Path magento2/var/tmp'"
 IGNORE="$IGNORE -ignore 'Path magento2/var/.setup_cronjob_status'"
 IGNORE="$IGNORE -ignore 'Path magento2/var/.update_cronjob_status'"
-IGNORE="$IGNORE -ignore 'Path magento2/pub/media'"
-IGNORE="$IGNORE -ignore 'Path magento2/pub/static'"
 
 # Other files not worth pushing to the container.
 IGNORE="$IGNORE -ignore 'Path magento2/.git'"
@@ -41,6 +35,10 @@ IGNORE="$IGNORE -ignore 'Name {.idea}'"
 IGNORE="$IGNORE -ignore 'Name {.*.swp}'"
 IGNORE="$IGNORE -ignore 'Name {.unison.*}'"
 
+# Fetch the external Docker Unison port number
+UNISON_PORT=$(docker-compose port web 5000 | awk -F: '{print $2}')
+
+REMOTE_ROOT=socket://localhost:$UNISON_PORT//var/www
 UNISONARGS="$LOCAL_ROOT $REMOTE_ROOT -prefer $LOCAL_ROOT -preferpartial 'Path var -> $REMOTE_ROOT' -auto -batch $IGNORE"
 
 if [[ ! -f $LOCAL_ROOT/magento2/vendor ]]; then
@@ -51,5 +49,13 @@ fi
 while true; do
     echo "**** Entering file watch mode ****"
     ./unison $UNISONARGS -repeat watch
+
     sleep 5
+
+    # Re-fetch the external Docker Unison port number in changes
+    UNISON_PORT=$(docker-compose port web 5000 | awk -F: '{print $2}')
+
+    REMOTE_ROOT=socket://localhost:$UNISON_PORT//var/www
+    UNISONARGS="$LOCAL_ROOT $REMOTE_ROOT -prefer $LOCAL_ROOT -preferpartial 'Path var -> $REMOTE_ROOT' -auto -batch $IGNORE"
+
 done