Merge branch 'update-guides-7.12' into 'master'
Add 7.12 update guides See merge request !1858
This commit is contained in:
commit
c14de4fd28
|
@ -1,7 +1,7 @@
|
||||||
# From 6.x or 7.x to 7.11
|
# From 6.x or 7.x to 7.12
|
||||||
*Make sure you view this [upgrade guide from the `master` branch](../../../master/doc/update/6.x-or-7.x-to-7.11.md) for the most up to date instructions.*
|
*Make sure you view this [upgrade guide from the `master` branch](../../../master/doc/update/6.x-or-7.x-to-7.12.md) for the most up to date instructions.*
|
||||||
|
|
||||||
This allows you to upgrade any version of GitLab from 6.0 and up (including 7.0 and up) to 7.11.
|
This allows you to upgrade any version of GitLab from 6.0 and up (including 7.0 and up) to 7.12.
|
||||||
|
|
||||||
## Global issue numbers
|
## Global issue numbers
|
||||||
|
|
||||||
|
@ -71,7 +71,7 @@ sudo -u git -H git checkout -- db/schema.rb # local changes will be restored aut
|
||||||
For GitLab Community Edition:
|
For GitLab Community Edition:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
sudo -u git -H git checkout 7-11-stable
|
sudo -u git -H git checkout 7-12-stable
|
||||||
```
|
```
|
||||||
|
|
||||||
OR
|
OR
|
||||||
|
@ -79,7 +79,7 @@ OR
|
||||||
For GitLab Enterprise Edition:
|
For GitLab Enterprise Edition:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
sudo -u git -H git checkout 7-11-stable-ee
|
sudo -u git -H git checkout 7-12-stable-ee
|
||||||
```
|
```
|
||||||
|
|
||||||
## 4. Install additional packages
|
## 4. Install additional packages
|
||||||
|
@ -162,11 +162,11 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
|
||||||
TIP: to see what changed in `gitlab.yml.example` in this release use next command:
|
TIP: to see what changed in `gitlab.yml.example` in this release use next command:
|
||||||
|
|
||||||
```
|
```
|
||||||
git diff 6-0-stable:config/gitlab.yml.example 7-11-stable:config/gitlab.yml.example
|
git diff 6-0-stable:config/gitlab.yml.example 7-12-stable:config/gitlab.yml.example
|
||||||
```
|
```
|
||||||
|
|
||||||
* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-11-stable/config/gitlab.yml.example but with your settings.
|
* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-12-stable/config/gitlab.yml.example but with your settings.
|
||||||
* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-11-stable/config/unicorn.rb.example but with your settings.
|
* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-12-stable/config/unicorn.rb.example but with your settings.
|
||||||
* Make `/home/git/gitlab-shell/config.yml` the same as https://gitlab.com/gitlab-org/gitlab-shell/blob/v2.6.0/config.yml.example but with your settings.
|
* Make `/home/git/gitlab-shell/config.yml` the same as https://gitlab.com/gitlab-org/gitlab-shell/blob/v2.6.0/config.yml.example but with your settings.
|
||||||
* Copy rack attack middleware config
|
* Copy rack attack middleware config
|
||||||
|
|
||||||
|
@ -182,10 +182,15 @@ sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
|
||||||
|
|
||||||
### Change Nginx settings
|
### Change Nginx settings
|
||||||
|
|
||||||
* HTTP setups: Make `/etc/nginx/sites-available/gitlab` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-11-stable/lib/support/nginx/gitlab but with your settings.
|
* HTTP setups: Make `/etc/nginx/sites-available/gitlab` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-12-stable/lib/support/nginx/gitlab but with your settings.
|
||||||
* HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-11-stable/lib/support/nginx/gitlab-ssl but with your settings.
|
* HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-12-stable/lib/support/nginx/gitlab-ssl but with your settings.
|
||||||
* A new `location /uploads/` section has been added that needs to have the same content as the existing `location @gitlab` section.
|
* A new `location /uploads/` section has been added that needs to have the same content as the existing `location @gitlab` section.
|
||||||
|
|
||||||
|
### Check the version of /usr/local/bin/git
|
||||||
|
|
||||||
|
If you installed Git from source into /usr/local/bin/git then please [check
|
||||||
|
your version](7.11-to-7.12.md).
|
||||||
|
|
||||||
## 9. Start application
|
## 9. Start application
|
||||||
|
|
||||||
sudo service gitlab start
|
sudo service gitlab start
|
|
@ -0,0 +1,129 @@
|
||||||
|
# From 7.11 to 7.12
|
||||||
|
|
||||||
|
### 0. Double-check your Git version
|
||||||
|
|
||||||
|
**This notice applies only to /usr/local/bin/git**
|
||||||
|
|
||||||
|
If you compiled Git from source on your GitLab server then please double-check
|
||||||
|
that you are using a version that protects against CVE-2014-9390. For six
|
||||||
|
months after this vulnerability became known the GitLab installation guide
|
||||||
|
still contained instructions that would install the outdated, 'vulnerable' Git
|
||||||
|
version 2.1.2.
|
||||||
|
|
||||||
|
Run the following command to get your current Git version.
|
||||||
|
|
||||||
|
```
|
||||||
|
/usr/local/bin/git --version
|
||||||
|
```
|
||||||
|
|
||||||
|
If you see 'No such file or directory' then you did not install Git according
|
||||||
|
to the outdated instructions from the GitLab installation guide and you can go
|
||||||
|
to the next step 'Stop server' below.
|
||||||
|
|
||||||
|
If you see a version string then it should be v1.8.5.6, v1.9.5, v2.0.5, v2.1.4,
|
||||||
|
v2.2.1 or newer. You can use the [instructions in the GitLab source
|
||||||
|
installation
|
||||||
|
guide](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md#1-packages-dependencies)
|
||||||
|
to install a newer version of Git.
|
||||||
|
|
||||||
|
### 1. Stop server
|
||||||
|
|
||||||
|
sudo service gitlab stop
|
||||||
|
|
||||||
|
### 2. Backup
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /home/git/gitlab
|
||||||
|
sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. Get latest code
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo -u git -H git fetch --all
|
||||||
|
sudo -u git -H git checkout -- db/schema.rb # local changes will be restored automatically
|
||||||
|
```
|
||||||
|
|
||||||
|
For GitLab Community Edition:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo -u git -H git checkout 7-12-stable
|
||||||
|
```
|
||||||
|
|
||||||
|
OR
|
||||||
|
|
||||||
|
For GitLab Enterprise Edition:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo -u git -H git checkout 7-12-stable-ee
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4. Update gitlab-shell
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /home/git/gitlab-shell
|
||||||
|
sudo -u git -H git fetch
|
||||||
|
sudo -u git -H git checkout v2.6.3
|
||||||
|
```
|
||||||
|
|
||||||
|
### 5. Install libs, migrations, etc.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /home/git/gitlab
|
||||||
|
|
||||||
|
# MySQL installations (note: the line below states '--without ... postgres')
|
||||||
|
sudo -u git -H bundle install --without development test postgres --deployment
|
||||||
|
|
||||||
|
# PostgreSQL installations (note: the line below states '--without ... mysql')
|
||||||
|
sudo -u git -H bundle install --without development test mysql --deployment
|
||||||
|
|
||||||
|
# Run database migrations
|
||||||
|
sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
|
||||||
|
|
||||||
|
# Clean up assets and cache
|
||||||
|
sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production
|
||||||
|
|
||||||
|
# Update init.d script
|
||||||
|
sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
|
||||||
|
```
|
||||||
|
|
||||||
|
### 6. Update config files
|
||||||
|
|
||||||
|
#### New configuration options for `gitlab.yml`
|
||||||
|
|
||||||
|
There are new configuration options available for [`gitlab.yml`](config/gitlab.yml.example). View them with the command below and apply them to your current `gitlab.yml`.
|
||||||
|
|
||||||
|
```
|
||||||
|
git diff origin/7-11-stable:config/gitlab.yml.example origin/7-12-stable:config/gitlab.yml.example
|
||||||
|
``````
|
||||||
|
|
||||||
|
### 7. Start application
|
||||||
|
|
||||||
|
sudo service gitlab start
|
||||||
|
sudo service nginx restart
|
||||||
|
|
||||||
|
### 8. Check application status
|
||||||
|
|
||||||
|
Check if GitLab and its environment are configured correctly:
|
||||||
|
|
||||||
|
sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production
|
||||||
|
|
||||||
|
To make sure you didn't miss anything run a more thorough check with:
|
||||||
|
|
||||||
|
sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
|
||||||
|
|
||||||
|
If all items are green, then congratulations, the upgrade is complete!
|
||||||
|
|
||||||
|
## Things went south? Revert to previous version (7.11)
|
||||||
|
|
||||||
|
### 1. Revert the code to the previous version
|
||||||
|
Follow the [upgrade guide from 7.10 to 7.11](7.10-to-7.11.md), except for the database migration
|
||||||
|
(The backup is already migrated to the previous version)
|
||||||
|
|
||||||
|
### 2. Restore from the backup:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /home/git/gitlab
|
||||||
|
sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
|
||||||
|
```
|
||||||
|
If you have more than one backup *.tar file(s) please add `BACKUP=timestamp_of_backup` to the command above.
|
Loading…
Reference in New Issue