From owner-svn-ports-all@freebsd.org Wed Jan 16 17:05:48 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2195148EA2E; Wed, 16 Jan 2019 17:05:48 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 57E25762DE; Wed, 16 Jan 2019 17:05:48 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 45B7D53B9; Wed, 16 Jan 2019 17:05:48 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0GH5mYJ077552; Wed, 16 Jan 2019 17:05:48 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0GH5lTP077550; Wed, 16 Jan 2019 17:05:47 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201901161705.x0GH5lTP077550@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Wed, 16 Jan 2019 17:05:47 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/devel/gitlab-runner: . files X-SVN-Commit-Revision: 490493 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 57E25762DE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2019 17:05:48 -0000 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()