summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2016-04-25 02:04:15 -0700
committerZac Medico <zmedico@gentoo.org>2016-04-25 02:05:30 -0700
commit21508b9a287a302d48439353674fb2face00b464 (patch)
tree6a607a512ecf6e693410fab9a574c4809dd0f5ac /app-emulation
parentros-meta/perception_pcl: Bump to 1.4.0. (diff)
downloadgentoo-21508b9a287a302d48439353674fb2face00b464.tar.gz
gentoo-21508b9a287a302d48439353674fb2face00b464.tar.bz2
gentoo-21508b9a287a302d48439353674fb2face00b464.zip
app-emulation/docker-registry: use config.yml example from tarball
Package-Manager: portage-2.2.28
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/docker-registry/docker-registry-2.4.0.ebuild2
-rw-r--r--app-emulation/docker-registry/files/config.yml18
2 files changed, 1 insertions, 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 08c7199e6d66..c5b0e84f4f65 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 b5700e1922d2..000000000000
--- 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