Commit 490f99d45e0f610e88505ff0fb2dc83a557e22c5
1 parent
1a3527f6
Exists in
spb-stable
and in
3 other branches
New stable branches and update guide
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
2 changed files
with
96 additions
and
2 deletions
Show diff stats
doc/install/installation.md
| ... | ... | @@ -173,13 +173,13 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](do |
| 173 | 173 | ## Clone the Source |
| 174 | 174 | |
| 175 | 175 | # Clone GitLab repository |
| 176 | - sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 6-5-stable gitlab | |
| 176 | + sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 6-6-stable gitlab | |
| 177 | 177 | |
| 178 | 178 | # Go to gitlab dir |
| 179 | 179 | cd /home/git/gitlab |
| 180 | 180 | |
| 181 | 181 | **Note:** |
| 182 | -You can change `6-5-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server! | |
| 182 | +You can change `6-6-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server! | |
| 183 | 183 | |
| 184 | 184 | ## Configure it |
| 185 | 185 | ... | ... |
| ... | ... | @@ -0,0 +1,94 @@ |
| 1 | +# From 6.5 to 6.6 | |
| 2 | + | |
| 3 | +### 0. Backup | |
| 4 | + | |
| 5 | +```bash | |
| 6 | +cd /home/git/gitlab | |
| 7 | +sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production | |
| 8 | +``` | |
| 9 | + | |
| 10 | +### 1. Stop server | |
| 11 | + | |
| 12 | + sudo service gitlab stop | |
| 13 | + | |
| 14 | +### 2. Get latest code | |
| 15 | + | |
| 16 | +```bash | |
| 17 | +cd /home/git/gitlab | |
| 18 | +sudo -u git -H git fetch --all | |
| 19 | +``` | |
| 20 | + | |
| 21 | +For Gitlab Community Edition: | |
| 22 | + | |
| 23 | +```bash | |
| 24 | +sudo -u git -H git checkout 6-6-stable | |
| 25 | +``` | |
| 26 | + | |
| 27 | +OR | |
| 28 | + | |
| 29 | +For GitLab Enterprise Edition: | |
| 30 | + | |
| 31 | +```bash | |
| 32 | +sudo -u git -H git checkout 6-6-stable-ee | |
| 33 | +``` | |
| 34 | + | |
| 35 | +### 3. Update gitlab-shell (and its config) | |
| 36 | + | |
| 37 | +```bash | |
| 38 | +cd /home/git/gitlab-shell | |
| 39 | +sudo -u git -H git fetch | |
| 40 | +sudo -u git -H git checkout v1.8.0 | |
| 41 | +``` | |
| 42 | + | |
| 43 | +### 4. Install libs, migrations, etc. | |
| 44 | + | |
| 45 | +```bash | |
| 46 | +cd /home/git/gitlab | |
| 47 | + | |
| 48 | +# MySQL installations (note: the line below states '--without ... postgres') | |
| 49 | +sudo -u git -H bundle install --without development test postgres --deployment | |
| 50 | + | |
| 51 | +# PostgreSQL installations (note: the line below states '--without ... mysql') | |
| 52 | +sudo -u git -H bundle install --without development test mysql --deployment | |
| 53 | + | |
| 54 | + | |
| 55 | +# Run database migrations | |
| 56 | +sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production | |
| 57 | + | |
| 58 | +# Clean up assets and cache | |
| 59 | +sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production | |
| 60 | + | |
| 61 | +# Update init.d script | |
| 62 | +sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab | |
| 63 | +``` | |
| 64 | + | |
| 65 | +### 5. Start application | |
| 66 | + | |
| 67 | + sudo service gitlab start | |
| 68 | + sudo service nginx restart | |
| 69 | + | |
| 70 | +### 6. Check application status | |
| 71 | + | |
| 72 | +Check if GitLab and its environment are configured correctly: | |
| 73 | + | |
| 74 | + sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production | |
| 75 | + | |
| 76 | +To make sure you didn't miss anything run a more thorough check with: | |
| 77 | + | |
| 78 | + sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production | |
| 79 | + | |
| 80 | +If all items are green, then congratulations upgrade is complete! | |
| 81 | + | |
| 82 | +## Things went south? Revert to previous version (6.5) | |
| 83 | + | |
| 84 | +### 1. Revert the code to the previous version | |
| 85 | +Follow the [`upgrade guide from 6.4 to 6.5`](6.4-to-6.5.md), except for the database migration | |
| 86 | +(The backup is already migrated to the previous version) | |
| 87 | + | |
| 88 | +### 2. Restore from the backup: | |
| 89 | + | |
| 90 | +```bash | |
| 91 | +cd /home/git/gitlab | |
| 92 | +sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production | |
| 93 | +``` | |
| 94 | +If you have more than one backup *.tar file(s) please add `BACKUP=timestamp_of_backup` to the command above. | ... | ... |