diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-05-11 12:04:18 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-05-16 17:15:27 +0100 |
| commit | 16b4d05dac360a1c81d4595b0e06bd9468f7e4a1 (patch) | |
| tree | 344c44cd69adea5fcd582b352ddda1258f1284e1 | |
| parent | 97547ae5fa3dd3389af7cabab748daf951214292 (diff) | |
[Vagrant] Update submodule on any provisioning.
On an initial clone, the Vagrantfile would check and make sure that the
submodule was present (and usable inside and outside the box), but on a
subsequent provisioning it wasn't making sure it was up to date.
| -rwxr-xr-x | Vagrantfile | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Vagrantfile b/Vagrantfile index 505883aa0..575eec765 100755 --- a/Vagrantfile +++ b/Vagrantfile @@ -30,16 +30,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # To prevent "dpkg-preconfigure: unable to re-open stdin: No such file or directory" warnings export DEBIAN_FRONTEND=noninteractive # Make sure git submodules are checked out! - if [ ! -e fixmystreet/commonlib/.git ]; then - echo "Checking out submodules" - apt-get -qq install -y git >/dev/null - cd fixmystreet - git submodule --quiet update --init --recursive - cd commonlib - git config core.worktree "../../../commonlib" - echo "gitdir: ../.git/modules/commonlib" > .git - cd ../.. - fi + echo "Checking submodules exist/up to date" + apt-get -qq install -y git >/dev/null + cd fixmystreet + git submodule --quiet update --init --recursive --rebase + cd commonlib + git config core.worktree "../../../commonlib" + echo "gitdir: ../.git/modules/commonlib" > .git + cd ../.. # Fetch and run install script wget -O install-site.sh --no-verbose https://github.com/mysociety/commonlib/raw/master/bin/install-site.sh sh install-site.sh --dev fixmystreet vagrant 127.0.0.1.xip.io |