Commit fbbd9897 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'update/deploy.sh' into 'master'

change mysql to postgres in some of the docs and scripts

* update deploy.sh, install gem without mysql, now that we want to use postgres instead
* update update_patch.md to assume postgres before mysql
* update ruby.md, to assume postgres
parents 10458bc4 28f40b72
...@@ -38,12 +38,12 @@ Replace LATEST_TAG with the latest GitLab Shell tag you want to upgrade to, for ...@@ -38,12 +38,12 @@ Replace LATEST_TAG with the latest GitLab Shell tag you want to upgrade to, for
```bash ```bash
cd /home/git/gitlab cd /home/git/gitlab
# MySQL
sudo -u git -H bundle install --without development test postgres --deployment
#PostgreSQL #PostgreSQL
sudo -u git -H bundle install --without development test mysql --deployment sudo -u git -H bundle install --without development test mysql --deployment
# MySQL
sudo -u git -H bundle install --without development test postgres --deployment
sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production
sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
......
...@@ -41,7 +41,7 @@ Just to be sure we will reinstall the gems used by GitLab. Note that the `bundle ...@@ -41,7 +41,7 @@ Just to be sure we will reinstall the gems used by GitLab. Note that the `bundle
```bash ```bash
cd /home/git/gitlab cd /home/git/gitlab
sudo -u git -H rm -rf vendor/bundle # remove existing Gem bundle sudo -u git -H rm -rf vendor/bundle # remove existing Gem bundle
sudo -u git -H bundle install --deployment --without development test postgres aws # Assuming MySQL sudo -u git -H bundle install --deployment --without development test mysql aws # Assuming PostgreSQL
``` ```
### 6. Start GitLab ### 6. Start GitLab
......
...@@ -28,7 +28,7 @@ sudo -u git -H git pull origin master ...@@ -28,7 +28,7 @@ sudo -u git -H git pull origin master
echo 'Deploy: Bundle and migrate' echo 'Deploy: Bundle and migrate'
# change it to your needs # change it to your needs
sudo -u git -H bundle --without aws development test postgres --deployment sudo -u git -H bundle --without aws development test mysql --deployment
sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production
...@@ -42,4 +42,4 @@ echo 'Deploy: Starting GitLab server...' ...@@ -42,4 +42,4 @@ echo 'Deploy: Starting GitLab server...'
sudo service gitlab start sudo service gitlab start
sudo -u git -H rm /home/git/gitlab/public/index.html sudo -u git -H rm /home/git/gitlab/public/index.html
echo 'Deploy: Done' echo 'Deploy: Done'
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment