diff options
Diffstat (limited to 'app-containers/reg')
| -rw-r--r-- | app-containers/reg/Manifest | 2 | ||||
| -rw-r--r-- | app-containers/reg/files/reg-0.16.1-config.patch (renamed from app-containers/reg/files/reg-0.16.0-config.patch) | 54 | ||||
| -rw-r--r-- | app-containers/reg/reg-0.16.1-r1.ebuild | 46 | ||||
| -rw-r--r-- | app-containers/reg/reg-0.16.1.ebuild | 54 |
4 files changed, 95 insertions, 61 deletions
diff --git a/app-containers/reg/Manifest b/app-containers/reg/Manifest index aa259755a17d..5c060ef79ca1 100644 --- a/app-containers/reg/Manifest +++ b/app-containers/reg/Manifest @@ -1,2 +1,2 @@ -DIST github.com-go-yaml-yaml-eb3733d160e7.tar.gz 64789 BLAKE2B a59db73ba751c932695913770550e115d46df28c4cff402325cf5324c97069e3acccb9faf39826a5da416f8c5b0cc69377cef41a6b1451afa82c7ae8bd620544 SHA512 9e34c34c907d1177e072eb5f3b421b8a3af0e68b490508691d745cdcf1145d9bcfd2592d909a4b05e7f12bfb62355d49861f6d2e1bd29b69cf026ef631965289 +DIST reg-0.16.1-deps.tar.xz 64969744 BLAKE2B 40cc07bc6b24660e945f0a20ea8a8de98e987c23fb44bfc2793ff808b7ef86b01956dbb17af70d13071ffa8ca1301409ca2ad350c73297263b7b24224f816642 SHA512 7c3c41c9b891118504b03c0996d2b6f50928e6f0d9300a2430574d4f39a810c2f8fa0f3d2c2405d4ef5a17509e84d2a19b040f89195885eacd7ae33c9ef67c50 DIST reg-0.16.1.tar.gz 3163977 BLAKE2B b161200e7b96b26054e121853bafb4751865de1146f07fa48418a6624beeebd10eb8fcde1af90f9dd3c20ffd8d5807a106d012bf996944c96b5ff841b0079fb4 SHA512 77fbd543de6e94c504e98a0364895b19099e3cde55a85a4413730de58de8e84f50889fdcfaffa1c76ae412a603ed6d5f4b1d57566ec814cf88df70278e91aee6 diff --git a/app-containers/reg/files/reg-0.16.0-config.patch b/app-containers/reg/files/reg-0.16.1-config.patch index 3ec1bf44d032..717861dfab38 100644 --- a/app-containers/reg/files/reg-0.16.0-config.patch +++ b/app-containers/reg/files/reg-0.16.1-config.patch @@ -1,20 +1,22 @@ -From 0ab86b565f437b9dede5d3a7cef56690d8d19bbb Mon Sep 17 00:00:00 2001 +From ce4b2828ec800f0d1782b97b9400bd71154e5bbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu> Date: Tue, 18 Sep 2018 15:42:24 +0200 -Subject: [PATCH 2/2] server: Read config from file +Subject: [PATCH] server: Read config from file --- README.md | 4 ++ config.yml.example | 37 ++++++++++++++++ + go.mod | 1 + + go.sum | 4 ++ server.go | 107 +++++++++++++++++++++++++++++++-------------- - 3 files changed, 114 insertions(+), 34 deletions(-) + 5 files changed, 119 insertions(+), 34 deletions(-) create mode 100644 config.yml.example diff --git a/README.md b/README.md -index 3b1b661f..5e0f0175 100644 +index 3c93191a..23b1b33c 100644 --- a/README.md +++ b/README.md -@@ -228,6 +228,7 @@ Flags: +@@ -212,6 +212,7 @@ Flags: -u, --username username for the registry (default: <none>) --listen-address address to listen on (default: <none>) --asset-path Path to assets and templates (default: <none>) @@ -22,7 +24,7 @@ index 3b1b661f..5e0f0175 100644 -f, --force-non-ssl force allow use of non-ssl (default: false) --once generate the templates once and then exit (default: false) --skip-ping skip pinging the registry while establishing connection (default: false) -@@ -243,6 +244,9 @@ Flags: +@@ -227,6 +228,9 @@ Flags: -p, --password password for the registry (default: <none>) ``` @@ -75,6 +77,43 @@ index 00000000..9d4be25f +# force-nonssl: false +## Clair Server: +# clair: +diff --git a/go.mod b/go.mod +index 4e7583e8..914297a8 100644 +--- a/go.mod ++++ b/go.mod +@@ -35,5 +35,6 @@ require ( + github.com/sirupsen/logrus v1.4.2 + golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect + google.golang.org/grpc v1.23.1 ++ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7 + gotest.tools v2.2.0+incompatible // indirect + ) +diff --git a/go.sum b/go.sum +index 71f46e16..ff078b3f 100644 +--- a/go.sum ++++ b/go.sum +@@ -54,8 +54,10 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL + github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= + github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= + github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= ++github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= + github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= + github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= ++github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= + github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= + github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= + github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= +@@ -115,8 +117,10 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA + google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= + google.golang.org/grpc v1.23.1 h1:q4XQuHFC6I28BKZpo6IYyb3mNO+l7lSOxRuYTCiDfXk= + google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= ++gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= + gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= + gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= ++gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7 h1:+t9dhfO+GNOIGJof6kPOAenx7YgrZMTdRPV+EsnPabk= + gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= + gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= + gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= diff --git a/server.go b/server.go index fcd4cd71..0c84d85d 100644 --- a/server.go @@ -252,3 +291,6 @@ index fcd4cd71..0c84d85d 100644 } return server.ListenAndServe() } +-- +2.34.1 + diff --git a/app-containers/reg/reg-0.16.1-r1.ebuild b/app-containers/reg/reg-0.16.1-r1.ebuild new file mode 100644 index 000000000000..a7f35b0e2b85 --- /dev/null +++ b/app-containers/reg/reg-0.16.1-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +GIT_COMMIT=4203e559f331009df04a3ca47820989c6c43e138 +inherit go-module + +DESCRIPTION="Docker registry v2 command line client" +HOMEPAGE="https://github.com/genuinetools/reg" +SRC_URI="https://github.com/genuinetools/reg/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" + +LICENSE="MIT Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="acct-group/reg + acct-user/reg +" +RDEPEND="${DEPEND}" + +RESTRICT+=" test " +S="${WORKDIR}/${PN}-${GIT_COMMIT}" + +PATCHES=( + "${FILESDIR}"/${P}-config.patch +) + +src_compile() { + export -n XDG_CACHE_HOME + ego build -ldflags " + -X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} + -X ${EGO_PN}/version.VERSION=${PV}" \ + -o reg . +} + +src_install() { + dobin reg + dodoc README.md + insinto /var/lib/${PN} + doins -r server/* + newinitd "${FILESDIR}"/reg.initd reg + newconfd "${FILESDIR}"/reg.confd reg + keepdir /var/log/reg + fowners -R reg:reg /var/log/reg /var/lib/reg/static +} diff --git a/app-containers/reg/reg-0.16.1.ebuild b/app-containers/reg/reg-0.16.1.ebuild deleted file mode 100644 index bfd5ac25d064..000000000000 --- a/app-containers/reg/reg-0.16.1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGO_VENDOR=( "gopkg.in/yaml.v2 eb3733d160e7 github.com/go-yaml/yaml" ) - -inherit golang-build golang-vcs-snapshot user - -EGO_PN="github.com/genuinetools/reg" -GIT_COMMIT="4203e559f331009df04a3ca47820989c6c43e138" -ARCHIVE_URI="https://${EGO_PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" -KEYWORDS="~amd64" - -DESCRIPTION="Docker registry v2 command line client" -HOMEPAGE="https://github.com/genuinetools/reg" -SRC_URI="${ARCHIVE_URI}" -LICENSE="MIT Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC" -SLOT="0" -IUSE="" - -RESTRICT="test" - -pkg_setup() { - enewgroup reg - enewuser reg -1 -1 /var/lib/reg reg -} - -src_prepare() { - pushd src/${EGO_PN} || die - eapply "${FILESDIR}"/reg-0.16.0-config.patch - default - popd || die -} - -src_compile() { - export -n GOCACHE GOPATH XDG_CACHE_HOME - pushd src/${EGO_PN} || die - GO111MODULE=on go build -mod=vendor -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die - popd || die -} - -src_install() { - dobin bin/* - dodoc src/${EGO_PN}/README.md - insinto /var/lib/${PN} - doins -r src/${EGO_PN}/server/* - newinitd "${FILESDIR}"/reg.initd reg - newconfd "${FILESDIR}"/reg.confd reg - - keepdir /var/log/reg - fowners -R reg:reg /var/log/reg /var/lib/reg/static -} |