Commit 96b17c17 authored by Kamil Trzciński's avatar Kamil Trzciński
Browse files

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
parents 63b36c92 9df73975
......@@ -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
Supports Markdown
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