[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-registry/, app-emulation/docker-registry/files/

[Zac Medico]

commit:     21508b9a287a302d48439353674fb2face00b464
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 09:04:15 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 09:05:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21508b9a

app-emulation/docker-registry: use config.yml example from tarball

Package-Manager: portage-2.2.28

 .../docker-registry/docker-registry-2.4.0.ebuild       |  2 +-
 app-emulation/docker-registry/files/config.yml         | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/app-emulation/docker-registry/docker-registry-2.4.0.ebuild 
b/app-emulation/docker-registry/docker-registry-2.4.0.ebuild
index 08c7199..c5b0e84 100644
--- a/app-emulation/docker-registry/docker-registry-2.4.0.ebuild
+++ b/app-emulation/docker-registry/docker-registry-2.4.0.ebuild
@@ -32,7 +32,7 @@ src_install() {
        exeinto /usr/libexec/${PN}
        doexe "${S}"/bin/*
        insinto /etc/docker/registry
-       newins "${FILESDIR}/config.yml" config.yml.example
+       newins "${S}"/src/${EGO_PN%/*}/cmd/registry/config-example.yml 
config.yml.example
        newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}"
        newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}"
        systemd_dounit "${FILESDIR}/${SVCNAME}.service"

diff --git a/app-emulation/docker-registry/files/config.yml 
b/app-emulation/docker-registry/files/config.yml
deleted file mode 100644
index b5700e1..0000000
--- a/app-emulation/docker-registry/files/config.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: 0.1
-log:
-  fields:
-    service: registry
-storage:
-    cache:
-        blobdescriptor: inmemory
-    filesystem:
-        rootdirectory: /var/lib/registry
-http:
-    addr: :5000
-    headers:
-        X-Content-Type-Options: [nosniff]
-health:
-  storagedriver:
-    enabled: true
-    interval: 10s
-    threshold: 3