From: Elan Ruusamäe <glen@pld-linux.org>
Date: Thu, 31 Aug 2017 14:01:46 +0000 (+0300)
Subject: fix using external prebuilt image
X-Git-Tag: auto/th/gitlab-runner-10.0.2-1~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgitlab-runner.git;a=commitdiff_plain;h=84d9b71

fix using external prebuilt image

this time actually tested
---

diff --git a/gitlab-ci-multi-runner.spec b/gitlab-ci-multi-runner.spec
index 3a1c009..6ab8367 100644
--- a/gitlab-ci-multi-runner.spec
+++ b/gitlab-ci-multi-runner.spec
@@ -1,7 +1,7 @@
 Summary:	The official GitLab CI runner written in Go
 Name:		gitlab-ci-multi-runner
 Version:	9.5.0
-Release:	1
+Release:	2
 License:	MIT
 Group:		Development/Building
 Source0:	https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/repository/archive.tar.gz?ref=v%{version}&/%{name}-%{version}.tar.gz
@@ -39,7 +39,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # go stuff
 %define _enable_debug_packages 0
-%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**};
+%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v %{?debug:-x} %{?**};
 %define import_path	gitlab.com/gitlab-org/gitlab-ci-multi-runner
 
 %description
diff --git a/nodim_gz.patch b/nodim_gz.patch
index 1dc643b..4762f2f 100644
--- a/nodim_gz.patch
+++ b/nodim_gz.patch
@@ -2,26 +2,34 @@ Last-Update: 2016-08-24
 Forwarded: not-needed
 Bug-Upstream: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1504
 Author: Dmitry Smirnov <onlyjob@debian.org>
+Author: Elan Ruusamäe <glen@pld-linux.org>
 Description: do not incorporate Docker image into executable.
 
---- gitlab-ci-multi-runner-9.5.0/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/docker/executor_docker.go	2017-08-22 16:20:43.000000000 +0300
-+++ gitlab-ci-multi-runner-9.5.0/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/docker/executor_docker.go	2017-08-28 00:25:29.417833457 +0300
-@@ -222,17 +222,11 @@
+--- gitlab-ci-multi-runner-9.5.0/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/docker/executor_docker.go	2017-08-28 00:25:29.417833457 +0300
++++ gitlab-ci-multi-runner-9.5.0/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/docker/executor_docker.go	2017-08-31 16:21:38.164066652 +0300
+@@ -6,6 +6,7 @@
+ 	"errors"
+ 	"fmt"
+ 	"io"
++	"io/ioutil"
+ 	"path"
+ 	"path/filepath"
+ 	"regexp"
+@@ -222,13 +222,13 @@
  		return &image, nil
  	}
  
 -	data, err := Asset("prebuilt-" + architecture + prebuiltImageExtension)
--	if err != nil {
++	s.Debugln("Loading prebuilt image...")
++
++	data, err := ioutil.ReadFile("/var/lib/gitlab-runner/prebuilt-" + architecture + ".tar.xz")
+ 	if err != nil {
 -		return nil, fmt.Errorf("Unsupported architecture: %s: %q", architecture, err.Error())
--	}
--
- 	s.Debugln("Loading prebuilt image...")
++		return nil, fmt.Errorf("Unable to read: %q", architecture, err.Error())
+ 	}
  
+-	s.Debugln("Loading prebuilt image...")
+-
  	ref := prebuiltImageName
  	source := types.ImageImportSource{
--		Source:     bytes.NewBuffer(data),
--		SourceName: "-",
-+		SourceName: "/var/lib/gitlab-runner/prebuilt-" + architecture + ".tar.xz",
- 	}
- 	options := types.ImageImportOptions{
- 		Tag: architecture + "-" + common.REVISION,
+ 		Source:     bytes.NewBuffer(data),