Commit 8aec8e65 authored by Joshua Lambert's avatar Joshua Lambert
Browse files

Merge branch...

Merge branch '1616-document-ce-to-ee-upgrade-process-for-other-official-installation-methods' into 'master'

Document CE to EE upgrade process for other official installation methods

Closes #1616

See merge request !7785
parents 2c616b47 6b270ac0
Pipeline #12575410 passed with stages
in 8 minutes and 45 seconds
official:
- url: https://gitlab.com/gitlab-org/gitlab-ce/tree/master/docker
logo: /images/logos/docker-logo.svg
name: Docker
desc: Official GitLab Docker Images
- url: http://docs.gitlab.com/ce/install/kubernetes/
- url: https://docs.gitlab.com/ee/install/kubernetes/gitlab_omnibus.html#upgrading-from-ce-to-ee-using-the-helm-chart
name: Kubernetes
logo: /images/logos/kubernetes-logo.svg
desc: Official Helm repository
- url: https://docs.gitlab.com/ee/install/google_cloud_platform/index.html
name: Google Cloud Platform
logo: /images/logos/google-cloud-logo.svg
desc: Official Google Cloud Launcher apps
- url: https://docs.gitlab.com/ce/articles/openshift_and_gitlab/index.html
name: RedHat OpenShift
logo: /images/logos/openshift-logo.svg
desc: Setup instructions
- url: https://gitlab.com/gitlab-terraform/gce
name: Terraform
logo: /images/logos/terraform-logo.svg
desc: For Google Compute Engine
- url: /aws
logo: /images/logos/aws-logo.svg
name: Amazon Web Services (AWS)
desc: AMIs for GitLab CE and EE
- url: /2016/07/13/how-to-setup-a-gitlab-instance-on-microsoft-azure/
logo: /images/logos/microsoft-azure-logo.svg
name: Microsoft Azure
desc: Setup tutorial
- url: http://docs.pivotal.io/partners/gitlab/
name: GitLab Pivotal Tile
logo: /images/logos/pcf-logo.svg
desc: GitLab EE Tile
- url: https://mesosphere.com/blog/2016/09/16/gitlab-dcos/
name: Mesosphere DC/OS
logo: /images/logos/mesosphere-logo.svg
- url: https://gitlab.com/gitlab-org/cookbook-omnibus-gitlab/blob/master/README.md
name: GitLab Omnibus Cookbook
desc: For production Chef installations
logo: /images/logos/chef-logo.svg
- url: https://docs.gitlab.com/runner/install/
name: GitLab Runner
desc: For GitLab CI/CD Pipelines
logo: /images/logos/runner-logo.svg
- url: https://docs.gitlab.com/ce/install/installation.html
name: Installation from source
desc: Complete step-by-step instructions
desc: GitLab-Omnibus Helm Chart
- url: https://gitlab.com/gitlab-org/gitlab-ee/tree/master/doc/update
name: Source
logo: /images/logos/source-logo.svg
- url: /update
name: Update GitLab
desc: Update to the latest release
logo: /images/logos/tanuki-logo.svg
- url: https://gitlab.com/gitlab-org/cookbook-omnibus-gitlab/blob/master/README.md
name: GitLab Development Kit
desc: For contributing to GitLab
logo: /images/logos/gitlab-logo.svg
- url: https://gitlab.com
name: GitLab.com
desc: Hosted by GitLab Inc.
logo: /images/logos/gitlab-logo.svg
desc: Upgrade instructions for each version
......@@ -13,29 +13,28 @@
%button{ copy_btn_options(backup_command) }
%i.fa.fa-clipboard{ aria: { label: copy_tooltip } }
%h4
2. Install Enterprise Edition
2. Upgrade to Enterprise Edition
%p
The GitLab EE package installs directly over top of the CE version, replacing it.
These instructions will install the most recent version of GitLab,
if you'd like to use the same version please
%a{ href: "http://docs.gitlab.com/omnibus/update/README.html#from-community-edition-to-enterprise-edition" }
consult our documentation.
%p
Add the GitLab EE package repository.
%pre.command
= "#{platform.download_command}\n#{platform.install_command}"
%button{ copy_btn_options("#{platform.download_command}\n#{platform.install_command}") }
= "#{platform.download_command}"
%button{ copy_btn_options("#{platform.download_command}") }
%i.fa.fa-clipboard{ aria: { label: copy_tooltip } }
%p
If you are not comfortable installing the repository through a piped script, you can find the
%a{ href: "https://packages.gitlab.com/gitlab/gitlab-ee/install" }entire script here
and
%a{ href: "https://packages.gitlab.com/gitlab/gitlab-ee" }select and download the package manually
and install using
Next, install GitLab Enterprise Edition package.
%pre.command
= platform.install_commands_manual
%button{ copy_btn_options("#{platform.install_commands_manual}") }
= "#{platform.install_command}"
%button{ copy_btn_options("#{platform.install_command}") }
%i.fa.fa-clipboard{ aria: { label: copy_tooltip } }
%h4
3. Configure and restart GitLab
3. Reconfigure and restart GitLab
%pre.command
= reconfigure_command
%button{ copy_btn_options(reconfigure_command) }
......
......@@ -41,7 +41,7 @@ extra_js:
%span.light
= distro.subtitle
%li.distro-content.js-distro-content.hidden{ class: "distro-content-#{index + 1}", id: distro.name }
.js-platform-ce.js-install-instructions
.js-platform-ee.js-install-instructions
= partial "_platform", locals: { platform: distro }
 
.method.official
......
Supports Markdown
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