Commit f93ceb5b authored by Suzanne Selhorn's avatar Suzanne Selhorn

Merge branch 'docs-docker-list-items' into 'master'

Fix list spacing

See merge request gitlab-org/gitlab!43652
parents d4b601d9 7845e4b5
...@@ -48,7 +48,6 @@ The simplest approach is to install GitLab Runner in `shell` execution mode. ...@@ -48,7 +48,6 @@ The simplest approach is to install GitLab Runner in `shell` execution mode.
GitLab Runner then executes job scripts as the `gitlab-runner` user. GitLab Runner then executes job scripts as the `gitlab-runner` user.
1. Install [GitLab Runner](https://gitlab.com/gitlab-org/gitlab-runner/#installation). 1. Install [GitLab Runner](https://gitlab.com/gitlab-org/gitlab-runner/#installation).
1. During GitLab Runner installation select `shell` as method of executing job scripts or use command: 1. During GitLab Runner installation select `shell` as method of executing job scripts or use command:
```shell ```shell
...@@ -158,7 +157,6 @@ Runner is installed using the [Helm chart](https://docs.gitlab.com/runner/instal ...@@ -158,7 +157,6 @@ Runner is installed using the [Helm chart](https://docs.gitlab.com/runner/instal
See the [related issue](https://gitlab.com/gitlab-org/charts/gitlab-runner/-/issues/83) for details. See the [related issue](https://gitlab.com/gitlab-org/charts/gitlab-runner/-/issues/83) for details.
1. Install [GitLab Runner](https://docs.gitlab.com/runner/install/). 1. Install [GitLab Runner](https://docs.gitlab.com/runner/install/).
1. Register GitLab Runner from the command line to use `docker` and `privileged` 1. Register GitLab Runner from the command line to use `docker` and `privileged`
mode: mode:
...@@ -318,7 +316,6 @@ are done to the services as well, making these incompatible. ...@@ -318,7 +316,6 @@ are done to the services as well, making these incompatible.
In order to do that, follow the steps: In order to do that, follow the steps:
1. Install [GitLab Runner](https://docs.gitlab.com/runner/install/). 1. Install [GitLab Runner](https://docs.gitlab.com/runner/install/).
1. Register GitLab Runner from the command line to use `docker` and share `/var/run/docker.sock`: 1. Register GitLab Runner from the command line to use `docker` and share `/var/run/docker.sock`:
```shell ```shell
......
...@@ -678,7 +678,6 @@ To add `DOCKER_AUTH_CONFIG` to a runner: ...@@ -678,7 +678,6 @@ To add `DOCKER_AUTH_CONFIG` to a runner:
- The double quotes included in the `DOCKER_AUTH_CONFIG` - The double quotes included in the `DOCKER_AUTH_CONFIG`
data must be escaped with backslashes. This prevents them from being data must be escaped with backslashes. This prevents them from being
interpreted as TOML. interpreted as TOML.
- The `environment` option is a list. Your runner may - The `environment` option is a list. Your runner may
have existing entries and you should add this to the list, not replace have existing entries and you should add this to the list, not replace
it. it.
...@@ -725,10 +724,8 @@ image which is private and requires you to log in into a private container regis ...@@ -725,10 +724,8 @@ image which is private and requires you to log in into a private container regis
To configure access for `aws_account_id.dkr.ecr.region.amazonaws.com`, follow these steps: To configure access for `aws_account_id.dkr.ecr.region.amazonaws.com`, follow these steps:
1. Make sure `docker-credential-ecr-login` is available in GitLab Runner's `$PATH`. 1. Make sure `docker-credential-ecr-login` is available in GitLab Runner's `$PATH`.
1. Have any of the following [AWS credentials setup](https://github.com/awslabs/amazon-ecr-credential-helper#aws-credentials). 1. Have any of the following [AWS credentials setup](https://github.com/awslabs/amazon-ecr-credential-helper#aws-credentials).
Make sure that GitLab Runner can access the credentials. Make sure that GitLab Runner can access the credentials.
1. Make GitLab Runner use it. There are two ways to accomplish this. Either: 1. Make GitLab Runner use it. There are two ways to accomplish this. Either:
- Create a [variable](../variables/README.md#gitlab-cicd-environment-variables) - Create a [variable](../variables/README.md#gitlab-cicd-environment-variables)
......
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