Skip to content
Browse files

Merge pull request #29 from dosire/update-information-in-readme

Note about updating gitlabhq version.
  • Loading branch information...
2 parents e088a43 + ef369ab commit fd242bd607887880851cda4981b5a7b3940728d4 @randx randx committed
Showing with 18 additions and 0 deletions.
  1. +18 −0 README.md
View
18 README.md
@@ -116,6 +116,24 @@ $ sudo /etc/init.d/xvfb stop
$ sudo /etc/init.d/xvfb start
```
+Updating
+---------------
+
+The gitlabhq version is _not_ updated when you rebuild your virtual machine with the following command:
+
+```bash
+$ vagrant destroy && vagrant up
+```
+
+You must update it yourself by going to the gitlabhq subdirectory in the gitlab-vagrant-vm repo and pulling the latest changes:
+
+```bash
+$ cd gitlabhq && git pull --ff origin master
+```
+
+A bit of background on why this is needed. When you run 'vagrant up' there is a [checkout action in the recipe](https://github.com/gitlabhq/gitlab-vagrant-vm/blob/master/site-cookbooks/gitlab/recipes/vagrant.rb#L54) that [points to](https://github.com/gitlabhq/gitlab-vagrant-vm/blob/master/site-cookbooks/gitlab/attributes/vagrant.rb#L10) the [gitlabhq repo](https://github.com/gitlabhq/gitlabhq). You won't see any difference when running 'git status' in the gitlab-vagrant-vm repo because gitlabhq/ is in the [.gitignore](https://github.com/gitlabhq/gitlab-vagrant-vm/blob/master/.gitignore). You can update the gitlabhq repo yourself or remove the gitlabhq directory so the repo is checked out again.
+
+
Troubleshooting
---------------

0 comments on commit fd242bd

Please sign in to comment.
Something went wrong with that request. Please try again.