diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-01-21 17:06:08 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-01-21 17:06:08 +0000 |
| commit | c94ce6fe5109f67ccfb0cc5ee9e6a43c6369399b (patch) | |
| tree | d4bee5ac28400a07204e8deea15a5993f3a41879 | |
| parent | 227ce776dcdaac35f6509d32428312ff0053de06 (diff) | |
| parent | bf88c46714e113e12e03e2b5bb66b696364924ee (diff) | |
| download | gitlab-ce-c94ce6fe5109f67ccfb0cc5ee9e6a43c6369399b.tar.gz | |
Merge branch '52346-skip-kerberos-in-update-docs' into 'master'
Skip kerberos when running 'bundle install' in update docs
Closes #52346
See merge request gitlab-org/gitlab-ce!24534
| -rw-r--r-- | doc/update/11.5-to-11.6.md | 8 | ||||
| -rw-r--r-- | doc/update/11.6-to-11.7.md | 8 | ||||
| -rw-r--r-- | doc/update/11.7-to-11.8.md | 7 |
3 files changed, 12 insertions, 11 deletions
diff --git a/doc/update/11.5-to-11.6.md b/doc/update/11.5-to-11.6.md index 2e9ec5d71de..33e09e1915b 100644 --- a/doc/update/11.5-to-11.6.md +++ b/doc/update/11.5-to-11.6.md @@ -317,11 +317,11 @@ sudo systemctl daemon-reload ```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 +sudo -u git -H bundle install --deployment --without development test mysql aws kerberos + +# MySQL installations (note: the line below states '--without postgres') +sudo -u git -H bundle install --deployment --without development test postgres aws kerberos # Optional: clean up old gems sudo -u git -H bundle clean diff --git a/doc/update/11.6-to-11.7.md b/doc/update/11.6-to-11.7.md index f9e3f565e0b..9e61d978631 100644 --- a/doc/update/11.6-to-11.7.md +++ b/doc/update/11.6-to-11.7.md @@ -317,11 +317,11 @@ sudo systemctl daemon-reload ```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 +sudo -u git -H bundle install --deployment --without development test mysql aws kerberos + +# MySQL installations (note: the line below states '--without postgres') +sudo -u git -H bundle install --deployment --without development test postgres aws kerberos # Optional: clean up old gems sudo -u git -H bundle clean diff --git a/doc/update/11.7-to-11.8.md b/doc/update/11.7-to-11.8.md index 1587c310876..7ab98d80eb9 100644 --- a/doc/update/11.7-to-11.8.md +++ b/doc/update/11.7-to-11.8.md @@ -320,11 +320,12 @@ sudo systemctl daemon-reload ```bash cd /home/git/gitlab +# PostgreSQL installations (note: the line below states '--without mysql') +sudo -u git -H bundle install --deployment --without development test mysql aws kerberos + # MySQL installations (note: the line below states '--without postgres') -sudo -u git -H bundle install --without postgres development test --deployment +sudo -u git -H bundle install --deployment --without development test postgres aws kerberos -# 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 |