From dac44ed3911b68a710a4cbad27a7f5b9de731723 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Sat, 3 Mar 2018 22:33:06 +0100 Subject: [PATCH] updated 'vhost' + make CI web really update vhost on branch master --- metactl/ci/web.sh | 5 +++-- virtual/vhost | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/metactl/ci/web.sh b/metactl/ci/web.sh index 2a87e5c..f977bf2 100644 --- a/metactl/ci/web.sh +++ b/metactl/ci/web.sh @@ -21,10 +21,11 @@ while true; do # 1. Go to root directory - cd $ROOT/../..; + cd $ROOT/../../virtual/vhost; # 2. Update submodule 'vhost' - git submodule update --remote; + git checkout master; + git pull origin master; # 3. Update composer docker exec php-fpm bash -c "cd /vhost; composer install"; diff --git a/virtual/vhost b/virtual/vhost index b59d1cb..e83b20e 160000 --- a/virtual/vhost +++ b/virtual/vhost @@ -1 +1 @@ -Subproject commit b59d1cbeff8d849690c94a42ad191607f611f9f8 +Subproject commit e83b20e9ff6501995a152124b0e06b2bc6d0a8a9