From fa39b49a5c596d1abdbd07f19db1e4d36a069dab Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Mon, 11 Mar 2019 17:37:14 +0100 Subject: [PATCH] vendor: don't remove containers/image/registries.conf Instruct vndr to not remove image/registries.conf to ease packaging on Ubuntu. Fixes: #618 Signed-off-by: Valentin Rothberg --- Makefile | 3 ++- .../containers/image/registries.conf | 21 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 vendor/github.com/containers/image/registries.conf diff --git a/Makefile b/Makefile index 61355260..86aba6d7 100644 --- a/Makefile +++ b/Makefile @@ -151,4 +151,5 @@ test-unit-local: vendor: vendor.conf .install.vndr $(GOPATH)/bin/vndr \ - -whitelist '^github.com/containers/image/docs/.*' + -whitelist '^github.com/containers/image/docs/.*' \ + -whitelist '^github.com/containers/image/registries.conf' diff --git a/vendor/github.com/containers/image/registries.conf b/vendor/github.com/containers/image/registries.conf new file mode 100644 index 00000000..f21051ba --- /dev/null +++ b/vendor/github.com/containers/image/registries.conf @@ -0,0 +1,21 @@ +# For more information on this configuration file, see containers-registries.conf(5). +# +# Registries to search for images that are not fully-qualified. +# i.e. foobar.com/my_image:latest vs my_image:latest +[registries.search] +registries = [] + +# Registries that do not use TLS when pulling images or uses self-signed +# certificates. +[registries.insecure] +registries = [] + +# Blocked Registries, blocks the `docker daemon` from pulling from the blocked registry. If you specify +# "*", then the docker daemon will only be allowed to pull from registries listed above in the search +# registries. Blocked Registries is deprecated because other container runtimes and tools will not use it. +# It is recommended that you use the trust policy file /etc/containers/policy.json to control which +# registries you want to allow users to pull and push from. policy.json gives greater flexibility, and +# supports all container runtimes and tools including the docker daemon, cri-o, buildah ... +# The atomic CLI `atomic trust` can be used to easily configure the policy.json file. +[registries.block] +registries = []