[packages/gitlab-ci-multi-runner] always avoid docker
glen
glen at pld-linux.org
Mon May 2 14:34:54 CEST 2016
commit a0a05733eb9238aebe67f2fb0b0050619eef62e2
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon May 2 15:34:46 2016 +0300
always avoid docker
gitlab-ci-multi-runner.spec | 9 +++++++++
1 file changed, 9 insertions(+)
---
diff --git a/gitlab-ci-multi-runner.spec b/gitlab-ci-multi-runner.spec
index b956822..0575ca9 100644
--- a/gitlab-ci-multi-runner.spec
+++ b/gitlab-ci-multi-runner.spec
@@ -40,8 +40,17 @@ ln -s %{SOURCE1} out/docker/prebuilt.tar.gz
# touch, otherwise make rules would download it nevertheless
touch out/docker/prebuilt.tar.gz
+# avoid docker being used even if executable found
+cat <<'EOF' > docker
+#!/bin/sh
+echo >&2 "No docker"
+exit 1
+EOF
+chmod a+rx docker
+
%build
export GOPATH=$(pwd):$(pwd)/Godeps/_workspace
+export PATH=$(pwd):$PATH
%{__make} docker
%gobuild
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ci-multi-runner.git/commitdiff/a0a05733eb9238aebe67f2fb0b0050619eef62e2
More information about the pld-cvs-commit
mailing list