summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2015-09-22 14:55:16 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2015-09-22 14:55:16 +0000
commit96b17c1735b655f33735eb306f3054dfba752cf6 (patch)
treebe0b1ae38616ec3c793433368999a272dc5ec5a8
parent63b36c926b8b38836f5b617ca197d9ada056b9e4 (diff)
parent9df73975538c00dd6c6b0d6bfba501957ef00bb3 (diff)
downloadgitlab-ci-96b17c1735b655f33735eb306f3054dfba752cf6.tar.gz
Merge branch 'master' into 'master'
Update allowed_images fully-open example When using private Docker registries (e.g. docker-reg.example.com/name/image), you need to include `"*/*/*"` in `allowed_images`. See merge request !255
-rw-r--r--doc/docker/using_docker_images.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/docker/using_docker_images.md b/doc/docker/using_docker_images.md
index ef449cd..dd3b5dd 100644
--- a/doc/docker/using_docker_images.md
+++ b/doc/docker/using_docker_images.md
@@ -154,7 +154,7 @@ If you are courageous enough, you can make it fully open and accept everything:
```
[runners.docker]
image = "ruby:2.1"
- allowed_images = ["*", "*/*"]
+ allowed_images = ["*", "*/*", "*/*/*"]
allowed_services = ["*", "*/*"]
```
@@ -200,4 +200,4 @@ The build_script is piped using STDIN to bash interpreter which executes the bui
docker rm -f -v build service-mysql service-postgres
```
This will forcefully (the `-f` switch) remove build container and service containers
-and all volumes (the `-v` switch) that were created with the container creation.
+and all volumes (the `-v` switch) that were created with the container creation. \ No newline at end of file