Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
75ba7d5d
Commit
75ba7d5d
authored
8 years ago
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prepare docs for 8.6 RC1
[ci skip]
parent
f7da99ae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
147 additions
and
2 deletions
+147
-2
doc/install/installation.md
doc/install/installation.md
+2
-2
doc/update/8.5-to-8.6.md
doc/update/8.5-to-8.6.md
+145
-0
No files found.
doc/install/installation.md
View file @
75ba7d5d
...
...
@@ -233,9 +233,9 @@ sudo usermod -aG redis git
### Clone the Source
# Clone GitLab repository
sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 8-
5
-stable gitlab
sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 8-
6
-stable gitlab
**Note:**
You can change
`8-
5
-stable`
to
`master`
if you want the
*bleeding edge*
version, but never install master on a production server!
**Note:**
You can change
`8-
6
-stable`
to
`master`
if you want the
*bleeding edge*
version, but never install master on a production server!
### Configure It
...
...
This diff is collapsed.
Click to expand it.
doc/update/8.5-to-8.6.md
0 → 100644
View file @
75ba7d5d
# From 8.5 to 8.6
### 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 8-6-stable
```
OR
For GitLab Enterprise Edition:
```
bash
sudo
-u
git
-H
git checkout 8-6-stable-ee
```
### 4. Update gitlab-shell
```
bash
cd
/home/git/gitlab-shell
sudo
-u
git
-H
git fetch
--all
sudo
-u
git
-H
git checkout v2.6.10
```
### 5. Update gitlab-workhorse
Install and compile gitlab-workhorse. This requires
[
Go 1.5
](
https://golang.org/dl
)
which should already be on your system from
GitLab 8.1.
```
bash
cd
/home/git/gitlab-workhorse
sudo
-u
git
-H
git fetch
--all
sudo
-u
git
-H
git checkout 0.6.5
sudo
-u
git
-H
make
```
### 6. 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
postgres development
test
--deployment
# PostgreSQL installations (note: the line below states '--without mysql')
sudo
-u
git
-H
bundle
install
--without
mysql development
test
--deployment
# Optional: clean up old gems
sudo
-u
git
-H
bundle clean
# 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
```
### 7. Update configuration 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 manually to your current
`gitlab.yml`
:
```
sh
git diff origin/8-5-stable:config/gitlab.yml.example origin/8-6-stable:config/gitlab.yml.example
```
#### Nginx configuration
Ensure you're still up-to-date with the latest NGINX configuration changes:
```
sh
# For HTTPS configurations
git diff origin/8-5-stable:lib/support/nginx/gitlab-ssl origin/8-6-stable:lib/support/nginx/gitlab-ssl
# For HTTP configurations
git diff origin/8-5-stable:lib/support/nginx/gitlab origin/8-6-stable:lib/support/nginx/gitlab
```
If you are using Apache instead of NGINX please see the updated [Apache templates].
Also note that because Apache does not support upstreams behind Unix sockets you
will need to let gitlab-workhorse listen on a TCP port. You can do this
via [/etc/default/gitlab].
[
Apache templates
]:
https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache
[
/etc/default/gitlab
]:
https://gitlab.com/gitlab-org/gitlab-ce/blob/8-6-stable/lib/support/init.d/gitlab.default.example#L37
#### Init script
Ensure you're still up-to-date with the latest init script changes:
sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
### 8. Start application
sudo service gitlab start
sudo service nginx restart
### 9. 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:
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 (8.5)
### 1. Revert the code to the previous version
Follow the
[
upgrade guide from 8.4 to 8.5
](
8.4-to-8.5.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.
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment