Commit 719c5885 authored by Steve Abrams's avatar Steve Abrams

Merge branch 'docs/fix-dependency-proxy-dind-docs' into 'master'

Fix DIND + Dependency Proxy docs

See merge request gitlab-org/gitlab!64878
parents 180f776d e1f543b3
...@@ -345,7 +345,7 @@ Below is an example of what your `.gitlab-ci.yml` should look like: ...@@ -345,7 +345,7 @@ Below is an example of what your `.gitlab-ci.yml` should look like:
```yaml ```yaml
build: build:
image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/group/project/docker:19.03.12 image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/docker:19.03.12
services: services:
- name: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/docker:18.09.7-dind - name: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/docker:18.09.7-dind
alias: docker alias: docker
......
...@@ -266,7 +266,8 @@ error during connect: Get http://docker:2376/v1.39/info: dial tcp: lookup docker ...@@ -266,7 +266,8 @@ error during connect: Get http://docker:2376/v1.39/info: dial tcp: lookup docker
This can be resolved by setting a service alias for the Docker service: This can be resolved by setting a service alias for the Docker service:
```plaintext ```yaml
services: services:
- name: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/docker:18.09.7-dind - name: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/docker:18.09.7-dind
alias: docker``` alias: docker
```
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