diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-01 21:09:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-01 21:09:29 +0300 |
commit | 3011f8b297a5b71cd505a672b59cc8d3e0aa9f65 (patch) | |
tree | 99bf3a2d875f92f7d77a8302911b1ff3ce2a19be /doc/ci | |
parent | 06f736847bb6a7f577a8f121f94e4cc7ddb51856 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
-rw-r--r-- | doc/ci/docker/using_docker_build.md | 18 | ||||
-rw-r--r-- | doc/ci/testing/code_quality.md | 2 |
2 files changed, 9 insertions, 11 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md index 1b2b1aef3b6..3f47af11380 100644 --- a/doc/ci/docker/using_docker_build.md +++ b/doc/ci/docker/using_docker_build.md @@ -23,7 +23,7 @@ To enable Docker commands for your CI/CD jobs, you can use: - [The shell executor](#use-the-shell-executor) - [Docker-in-Docker](#use-docker-in-docker) -- [Docker socket binding](#use-docker-socket-binding) +- [Docker socket binding](#use-the-docker-executor-with-docker-socket-binding) ### Use the shell executor @@ -347,7 +347,7 @@ Docker-in-Docker is the recommended configuration, but you should be aware of th - docker run -v "$MOUNT_POINT:/mnt" my-docker-image ``` -### Use Docker socket binding +### Use the Docker executor with Docker socket binding To use Docker commands in your CI/CD jobs, you can bind-mount `/var/run/docker.sock` into the container. Docker is then available in the context of the image. @@ -358,8 +358,6 @@ If you bind the Docker socket and you are you can no longer use `docker:20.10.16-dind` as a service. Volume bindings also affect services, making them incompatible. -#### Use the Docker executor with Docker socket binding - To make Docker available in the context of the image, you need to mount `/var/run/docker.sock` into the launched containers. To do this with the Docker executor, add `"/var/run/docker.sock:/var/run/docker.sock"` to the @@ -394,14 +392,14 @@ sudo gitlab-runner register -n \ --docker-volumes /var/run/docker.sock:/var/run/docker.sock ``` -##### Enable registry mirror for `docker:dind` service +#### Enable registry mirror for `docker:dind` service When the Docker daemon starts inside the service container, it uses the default configuration. You might want to configure a [registry mirror](https://docs.docker.com/registry/recipes/mirror/) for performance improvements and to ensure you do not exceed Docker Hub rate limits. -###### The service in the `.gitlab-ci.yml` file +##### The service in the `.gitlab-ci.yml` file You can append extra CLI flags to the `dind` service to set the registry mirror: @@ -412,7 +410,7 @@ services: command: ["--registry-mirror", "https://registry-mirror.example.com"] # Specify the registry mirror to use ``` -###### The service in the GitLab Runner configuration file +##### The service in the GitLab Runner configuration file > [Introduced](https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27173) in GitLab Runner 13.6. @@ -449,7 +447,7 @@ Kubernetes: command = ["--registry-mirror", "https://registry-mirror.example.com"] ``` -###### The Docker executor in the GitLab Runner configuration file +##### The Docker executor in the GitLab Runner configuration file If you are a GitLab Runner administrator, you can use the mirror for every `dind` service. Update the @@ -482,7 +480,7 @@ detected by the `dind` service. volumes = ["/opt/docker/daemon.json:/etc/docker/daemon.json:ro"] ``` -###### The Kubernetes executor in the GitLab Runner configuration file +##### The Kubernetes executor in the GitLab Runner configuration file > [Introduced](https://gitlab.com/gitlab-org/gitlab-runner/-/issues/3223) in GitLab Runner 13.6. @@ -530,7 +528,7 @@ The `dind` service detects this configuration. sub_path = "daemon.json" ``` -##### Known issues with Docker socket binding +#### Known issues with Docker socket binding When you use Docker socket binding, you avoid running Docker in privileged mode. However, the implications of this method are: diff --git a/doc/ci/testing/code_quality.md b/doc/ci/testing/code_quality.md index f052f349b5c..367777960b5 100644 --- a/doc/ci/testing/code_quality.md +++ b/doc/ci/testing/code_quality.md @@ -126,7 +126,7 @@ Quality because: This alternative configuration uses socket binding to share the Runner's Docker daemon with the job environment. Before implementing this configuration, consider its -[limitations](../docker/using_docker_build.md#use-docker-socket-binding). +[limitations](../docker/using_docker_build.md#use-the-docker-executor-with-docker-socket-binding). To use private runners: |