Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f93ceb5b
Commit
f93ceb5b
authored
Sep 29, 2020
by
Suzanne Selhorn
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'docs-docker-list-items' into 'master'
Fix list spacing See merge request gitlab-org/gitlab!43652
parents
d4b601d9
7845e4b5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
6 deletions
+0
-6
doc/ci/docker/using_docker_build.md
doc/ci/docker/using_docker_build.md
+0
-3
doc/ci/docker/using_docker_images.md
doc/ci/docker/using_docker_images.md
+0
-3
No files found.
doc/ci/docker/using_docker_build.md
View file @
f93ceb5b
...
...
@@ -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.
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:
```
shell
...
...
@@ -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.
1.
Install
[
GitLab Runner
](
https://docs.gitlab.com/runner/install/
)
.
1.
Register GitLab Runner from the command line to use
`docker`
and
`privileged`
mode:
...
...
@@ -318,7 +316,6 @@ are done to the services as well, making these incompatible.
In order to do that, follow the steps:
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`
:
```
shell
...
...
doc/ci/docker/using_docker_images.md
View file @
f93ceb5b
...
...
@@ -678,7 +678,6 @@ To add `DOCKER_AUTH_CONFIG` to a runner:
-
The double quotes included in the
`DOCKER_AUTH_CONFIG`
data must be escaped with backslashes. This prevents them from being
interpreted as TOML.
-
The
`environment`
option is a list. Your runner may
have existing entries and you should add this to the list, not replace
it.
...
...
@@ -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:
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
)
.
Make sure that GitLab Runner can access the credentials.
1.
Make GitLab Runner use it. There are two ways to accomplish this. Either:
-
Create a
[
variable
](
../variables/README.md#gitlab-cicd-environment-variables
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment