| 1 |
commit: 21508b9a287a302d48439353674fb2face00b464 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 25 09:04:15 2016 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 25 09:05:30 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21508b9a |
| 7 |
|
| 8 |
app-emulation/docker-registry: use config.yml example from tarball |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
.../docker-registry/docker-registry-2.4.0.ebuild | 2 +- |
| 13 |
app-emulation/docker-registry/files/config.yml | 18 ------------------ |
| 14 |
2 files changed, 1 insertion(+), 19 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-emulation/docker-registry/docker-registry-2.4.0.ebuild b/app-emulation/docker-registry/docker-registry-2.4.0.ebuild |
| 17 |
index 08c7199..c5b0e84 100644 |
| 18 |
--- a/app-emulation/docker-registry/docker-registry-2.4.0.ebuild |
| 19 |
+++ b/app-emulation/docker-registry/docker-registry-2.4.0.ebuild |
| 20 |
@@ -32,7 +32,7 @@ src_install() { |
| 21 |
exeinto /usr/libexec/${PN} |
| 22 |
doexe "${S}"/bin/* |
| 23 |
insinto /etc/docker/registry |
| 24 |
- newins "${FILESDIR}/config.yml" config.yml.example |
| 25 |
+ newins "${S}"/src/${EGO_PN%/*}/cmd/registry/config-example.yml config.yml.example |
| 26 |
newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}" |
| 27 |
newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}" |
| 28 |
systemd_dounit "${FILESDIR}/${SVCNAME}.service" |
| 29 |
|
| 30 |
diff --git a/app-emulation/docker-registry/files/config.yml b/app-emulation/docker-registry/files/config.yml |
| 31 |
deleted file mode 100644 |
| 32 |
index b5700e1..0000000 |
| 33 |
--- a/app-emulation/docker-registry/files/config.yml |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,18 +0,0 @@ |
| 36 |
-version: 0.1 |
| 37 |
-log: |
| 38 |
- fields: |
| 39 |
- service: registry |
| 40 |
-storage: |
| 41 |
- cache: |
| 42 |
- blobdescriptor: inmemory |
| 43 |
- filesystem: |
| 44 |
- rootdirectory: /var/lib/registry |
| 45 |
-http: |
| 46 |
- addr: :5000 |
| 47 |
- headers: |
| 48 |
- X-Content-Type-Options: [nosniff] |
| 49 |
-health: |
| 50 |
- storagedriver: |
| 51 |
- enabled: true |
| 52 |
- interval: 10s |
| 53 |
- threshold: 3 |
Archives