harbor: update

This commit is contained in:
Alexander Miroshnichenko 2019-10-04 18:04:29 +03:00
parent 5d6781f27b
commit 0e1bad76c5
No known key found for this signature in database
GPG Key ID: E93720C6C73A77F4
2 changed files with 5 additions and 2 deletions

View File

@ -5,6 +5,7 @@
envfile=${HARBOR_CORE_ENV_FILE:-/etc/harbor/core/env} envfile=${HARBOR_CORE_ENV_FILE:-/etc/harbor/core/env}
envkeys="$(grep -v ^# ${envfile} |cut -f1 -d=)" envkeys="$(grep -v ^# ${envfile} |cut -f1 -d=)"
pidfile=${pidfile:-/run/harbor-core.pid}
command=/usr/bin/harbor-core command=/usr/bin/harbor-core
start_stop_daemon_args="`for key in ${envkeys}; start_stop_daemon_args="`for key in ${envkeys};
do echo -n ' -e '"${key}"=$(grep ^${key} ${envfile}|cut -f2 -d=); do echo -n ' -e '"${key}"=$(grep ^${key} ${envfile}|cut -f2 -d=);

View File

@ -9,6 +9,8 @@ GOLANG_PKG_HAVE_TEST=1
GOLANG_PKG_BUILDPATH="/src/core /src/jobservice /src/registryctl" GOLANG_PKG_BUILDPATH="/src/core /src/jobservice /src/registryctl"
GOLANG_PKG_HAVE_TEST=1 GOLANG_PKG_HAVE_TEST=1
WEBAPP_OPTIONAL="yes"
inherit user golang-single webapp inherit user golang-single webapp
DESCRIPTION="An open source trusted cloud native registry project that stores, signs, and scans content." DESCRIPTION="An open source trusted cloud native registry project that stores, signs, and scans content."
@ -23,7 +25,7 @@ REQUIRED_USE="|| ( core jobservice portal registryctl )"
DEPEND="dev-lang/go DEPEND="dev-lang/go
net-libs/nodejs net-libs/nodejs
<dev-python/pyyaml-4" <dev-python/pyyaml-4"
RDEPEND="portal? ( virtual/httpd-php )" RDEPEND="portal? ( app-admin/webapp-config )"
BDEPEND="" BDEPEND=""
WEBAPP_MANUAL_SLOT="yes" WEBAPP_MANUAL_SLOT="yes"
@ -50,7 +52,7 @@ src_compile() {
} }
src_install() { src_install() {
use core && newbin ${GOBIN}/core ${PN}-core && doinitd ${FILESDIR}/harbor-core.init.d use core && newbin ${GOBIN}/core ${PN}-core && newinitd ${FILESDIR}/harbor-core.initd harbor-core
use jobservice && newbin ${GOBIN}/jobservice ${PN}-jobservice use jobservice && newbin ${GOBIN}/jobservice ${PN}-jobservice
use registryctl && newbin ${GOBIN}/registryctl ${PN}-registryctl use registryctl && newbin ${GOBIN}/registryctl ${PN}-registryctl