Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Jan 2019 17:05:47 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r490493 - in head/devel/gitlab-runner: . files
Message-ID:  <201901161705.x0GH5lTP077550@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Wed Jan 16 17:05:47 2019
New Revision: 490493
URL: https://svnweb.freebsd.org/changeset/ports/490493

Log:
  devel/gitlab-runner: Fix env issue
  
  The rc script failed to pass the environtment to the command, causing
  automated (non-interactive) configuration to fail.
  
  MFH:		2019Q1

Modified:
  head/devel/gitlab-runner/Makefile   (contents, props changed)
  head/devel/gitlab-runner/files/gitlab_runner.in

Modified: head/devel/gitlab-runner/Makefile
==============================================================================
--- head/devel/gitlab-runner/Makefile	Wed Jan 16 16:45:09 2019	(r490492)
+++ head/devel/gitlab-runner/Makefile	Wed Jan 16 17:05:47 2019	(r490493)
@@ -2,6 +2,7 @@
 
 PORTNAME=	gitlab-runner
 PORTVERSION=	11.6.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	\
 		https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerx64 \

Modified: head/devel/gitlab-runner/files/gitlab_runner.in
==============================================================================
--- head/devel/gitlab-runner/files/gitlab_runner.in	Wed Jan 16 16:45:09 2019	(r490492)
+++ head/devel/gitlab-runner/files/gitlab_runner.in	Wed Jan 16 17:05:47 2019	(r490493)
@@ -36,7 +36,7 @@ export PATH=${PATH}:%%PREFIX%%/bin
 
 pidfile="/var/run/${name}.pid"
 command="/usr/sbin/daemon"
-command_args="-f -p ${pidfile} %%PREFIX%%/bin/gitlab-runner run --syslog --service ${gitlab_runner_syslogtag}"
+command_args="-f -p ${pidfile} env HOME=${gitlab_runner_dir} ${gitlab_runner_env} %%PREFIX%%/bin/gitlab-runner run --syslog --service ${gitlab_runner_syslogtag}"
 gitlab_runner_chdir="${gitlab_runner_dir}"
 
 procname=%%PREFIX%%/bin/gitlab-runner
@@ -47,12 +47,12 @@ register_cmd="registerfunc"
 
 listfunc()
 {
-        su -m ${gitlab_runner_user} -c "env HOME=${gitlab_runner_dir} %%PREFIX%%/bin/gitlab-runner list"
+        su -m ${gitlab_runner_user} -c "env HOME=${gitlab_runner_dir} ${gitlab_runner_env} %%PREFIX%%/bin/gitlab-runner list"
 }
 
 registerfunc()
 {
-        su -m ${gitlab_runner_user} -c "env HOME=${gitlab_runner_dir} %%PREFIX%%/bin/gitlab-runner register"
+        su -m ${gitlab_runner_user} -c "env HOME=${gitlab_runner_dir} ${gitlab_runner_env} %%PREFIX%%/bin/gitlab-runner register"
 }
 
 gitlab_runner_startprecmd()



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901161705.x0GH5lTP077550>