Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'doc/install/docker.md')
-rw-r--r--doc/install/docker.md23
1 files changed, 10 insertions, 13 deletions
diff --git a/doc/install/docker.md b/doc/install/docker.md
index ab1aec98b16..925da8a2b4a 100644
--- a/doc/install/docker.md
+++ b/doc/install/docker.md
@@ -282,10 +282,6 @@ Here's an example that deploys GitLab with four runners as a [stack](https://doc
docker stack deploy --compose-file docker-compose.yml mystack
```
-### Install the product documentation
-
-This is an optional step. See how to [self-host the product documentation](../administration/docs_self_host.md#self-host-the-product-documentation-with-docker).
-
## Configuration
This container uses the official Omnibus GitLab package, so all configuration
@@ -487,6 +483,12 @@ If, for any reason, you wish to switch back to single database connection:
sudo docker restart gitlab
```
+## Recommended next steps
+
+After completing your installation, consider taking the
+[recommended next steps](next_steps.md), including authentication options
+and sign-up restrictions.
+
## Upgrade
In most cases, upgrading GitLab is as easy as downloading the newest Docker
@@ -580,11 +582,6 @@ The following steps assume that you are upgrading the same version.
replace `ce` with `ee` in your `docker run` command or `docker-compose.yml` file.
However, reuse the CE container name, port and file mappings, and version.
-### Upgrade the product documentation
-
-This is an optional step. If you [installed the documentation site](#install-the-product-documentation),
-see how to [upgrade to another version](../administration/docs_self_host.md#upgrade-using-docker).
-
### Downgrade GitLab
To downgrade GitLab after an upgrade:
@@ -596,7 +593,7 @@ To downgrade GitLab after an upgrade:
- Restoring is required to back out database data and schema changes (migrations) made as part of the upgrade.
- GitLab backups must be restored to the exact same version and edition.
- - [Follow the restore steps for Docker images](../raketasks/restore_gitlab.md#restore-for-docker-image-and-gitlab-helm-chart-installations), including
+ - [Follow the restore steps for Docker images](../administration/backup_restore/restore_gitlab.md#restore-for-docker-image-and-gitlab-helm-chart-installations), including
stopping Puma and Sidekiq. Only the database must be restored, so add
`SKIP=artifacts,repositories,registry,uploads,builds,pages,lfs,packages,terraform_state`
to the `gitlab-backup restore` command line arguments.
@@ -609,7 +606,7 @@ You can create a GitLab backup with:
docker exec -t <container name> gitlab-backup create
```
-Read more on how to [back up and restore GitLab](../raketasks/backup_restore.md).
+Read more on how to [back up and restore GitLab](../administration/backup_restore/index.md).
NOTE:
If configuration is provided entirely via the `GITLAB_OMNIBUS_CONFIG` environment variable
@@ -618,8 +615,8 @@ meaning no configuration is set directly in the `gitlab.rb` file, then there is
to back up the `gitlab.rb` file.
WARNING:
-[Backing up the GitLab secrets file](../raketasks/backup_gitlab.md#storing-configuration-files) is required
-to avoid [complicated steps](../raketasks/backup_restore.md#when-the-secrets-file-is-lost) when recovering
+[Backing up the GitLab secrets file](../administration/backup_restore/backup_gitlab.md#storing-configuration-files) is required
+to avoid [complicated steps](../administration/backup_restore/backup_gitlab.md#when-the-secrets-file-is-lost) when recovering
GitLab from backup. The secrets file is stored at `/etc/gitlab/gitlab-secrets.json` inside the container, or
`$GITLAB_HOME/config/gitlab-secrets.json` [on the container host](#set-up-the-volumes-location).