|
45 | 45 | - [SAML](#saml)
|
46 | 46 | - [Crowd](#crowd)
|
47 | 47 | - [Microsoft Azure](#microsoft-azure)
|
48 |
| - - [Generic OAuth2](#Generic-OAuth2) |
| 48 | + - [Generic OAuth2](#generic-oauth2) |
49 | 49 | - [OpenID Connect](#openid-connect)
|
50 | 50 | - [Gitlab Pages](#gitlab-pages)
|
51 | 51 | - [External Issue Trackers](#external-issue-trackers)
|
|
59 | 59 | - [Restoring Backups](#restoring-backups)
|
60 | 60 | - [Automated Backups](#automated-backups)
|
61 | 61 | - [Amazon Web Services (AWS) Remote Backups](#amazon-web-services-aws-remote-backups)
|
62 |
| - - [Google Cloud Storage (GCS) Remote Backups](#google-cloud-storage-gcs-remote-backup) |
| 62 | + - [Google Cloud Storage (GCS) Remote Backups](#google-cloud-storage-gcs-remote-backups) |
63 | 63 | - [Rake Tasks](#rake-tasks)
|
64 | 64 | - [Import Repositories](#import-repositories)
|
65 | 65 | - [Upgrading](#upgrading)
|
|
72 | 72 |
|
73 | 73 | ## Introduction
|
74 | 74 |
|
75 |
| -Dockerfile to build a [GitLab](https://about.gitlab.com/) image for the [Docker](https://www.docker.com/products/docker-engine) opensource container platform. |
| 75 | +Dockerfile to build a [GitLab](https://about.gitlab.com/) image for the [Docker](https://www.docker.com/products/docker-engine) open source container platform. |
76 | 76 |
|
77 | 77 | GitLab CE is set up in the Docker image using the [install from source](https://docs.gitlab.com/ce/install/installation.html) method as documented in the official GitLab documentation.
|
78 | 78 |
|
@@ -599,11 +599,11 @@ The default path image is configured to look for the trusted SSL certificates is
|
599 | 599 |
|
600 | 600 | Copy the `ca.crt` file into the certs directory on the [datastore](#data-store). The `ca.crt` file should contain the root certificates of all the servers you want to trust. With respect to GitLab CI, this will be the contents of the gitlab_ci.crt file as described in the [README](https://github.com/sameersbn/docker-gitlab-ci/blob/master/README.md#ssl) of the [docker-gitlab-ci](https://github.com/sameersbn/docker-gitlab-ci) container.
|
601 | 601 |
|
602 |
| -By default, our own server certificate [gitlab.crt](#generation-of-self-signed-certificate) is added to the trusted certificates list. |
| 602 | +By default, our own server certificate [gitlab.crt](#generation-of-a-self-signed-certificate) is added to the trusted certificates list. |
603 | 603 |
|
604 | 604 | #### Deploy to a subdirectory (relative url root)
|
605 | 605 |
|
606 |
| -By default, GitLab expects that your application is running at the root e.g.. /). This section explains how to run your application inside a directory. |
| 606 | +By default, GitLab expects that your application is running at the root (e.g.. /). This section explains how to run your application inside a directory. |
607 | 607 |
|
608 | 608 | Let's assume we want to deploy our application to '/git'. GitLab needs to know this directory to generate the appropriate routes. This can be specified using the `GITLAB_RELATIVE_URL_ROOT` configuration option like so:
|
609 | 609 |
|
@@ -1876,7 +1876,7 @@ The database type. Currently only postgresql is supported. Possible values: `pos
|
1876 | 1876 |
|
1877 | 1877 | ##### `DB_ENCODING`
|
1878 | 1878 |
|
1879 |
| -The database encoding. For `DB_ADAPTER` values `postresql` this parameter defaults and `utf8` respectively. |
| 1879 | +The database encoding. For `DB_ADAPTER` values `postgresql` this parameter defaults and `utf8` respectively. |
1880 | 1880 |
|
1881 | 1881 | ##### `DB_HOST`
|
1882 | 1882 |
|
@@ -1984,7 +1984,7 @@ Enable SSL. Defaults to `true`.
|
1984 | 1984 |
|
1985 | 1985 | ##### `IMAP_STARTTLS`
|
1986 | 1986 |
|
1987 |
| -Enable STARTSSL. Defaults to `false`. |
| 1987 | +Enable STARTTLS. Defaults to `false`. |
1988 | 1988 |
|
1989 | 1989 | ##### `IMAP_MAILBOX`
|
1990 | 1990 |
|
@@ -2528,7 +2528,7 @@ Sentry DSN. No defaults.
|
2528 | 2528 |
|
2529 | 2529 | ##### `SENTRY_CLIENTSIDE_DSN`
|
2530 | 2530 |
|
2531 |
| -Sentry clientside DSN. No defaults. |
| 2531 | +Sentry client side DSN. No defaults. |
2532 | 2532 |
|
2533 | 2533 | ##### `SENTRY_ENVIRONMENT`
|
2534 | 2534 |
|
@@ -2670,7 +2670,7 @@ docker run --name gitlab -it --rm [OPTIONS] \
|
2670 | 2670 | sameersbn/gitlab:18.0.2 app:rake gitlab:env:info
|
2671 | 2671 | ```
|
2672 | 2672 |
|
2673 |
| -You can also use `docker exec` to run raketasks on running gitlab instance. For example, |
| 2673 | +You can also use `docker exec` to run rake tasks on running gitlab instance. For example, |
2674 | 2674 |
|
2675 | 2675 | ```bash
|
2676 | 2676 | docker exec --user git -it gitlab bundle exec rake gitlab:env:info RAILS_ENV=production
|
@@ -2818,7 +2818,7 @@ services:
|
2818 | 2818 | start_period: 2m
|
2819 | 2819 | ```
|
2820 | 2820 |
|
2821 |
| -Then you will be able to consult the healthcheck log by executing: |
| 2821 | +Then you will be able to consult the health check log by executing: |
2822 | 2822 |
|
2823 | 2823 | ```bash
|
2824 | 2824 | docker inspect --format "{{json .State.Health }}" $(docker-compose ps -q gitlab) | jq
|
|
0 commit comments