projects / packages / gitlab-runner.git / blame
| Commit | Line | Data |
|---|---|---|
| 72cef35a ER |
1 | Last-Update: 2016-08-24 |
| 2 | Forwarded: not-needed | |
| 3 | Bug-Upstream: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1504 | |
| 4 | Author: Dmitry Smirnov <onlyjob@debian.org> | |
| 5 | Description: do not incorporate Docker image into executable. | |
| 6 | ||
| 225ac429 ER |
7 | --- gitlab-ci-multi-runner/executors/docker/executor_docker.go~ 2016-12-22 16:21:38.000000000 +0200 |
| 8 | +++ gitlab-ci-multi-runner/executors/docker/executor_docker.go 2016-12-23 14:41:59.425571451 +0200 | |
| 9 | @@ -208,17 +208,11 @@ | |
| 72cef35a ER |
10 | return |
| 11 | } | |
| 12 | ||
| 13 | - data, err := Asset("prebuilt-" + architecture + prebuiltImageExtension) | |
| 14 | - if err != nil { | |
| 15 | - return nil, fmt.Errorf("Unsupported architecture: %s: %q", architecture, err.Error()) | |
| 16 | - } | |
| 17 | - | |
| 18 | s.Debugln("Loading prebuilt image...") | |
| 19 | err = s.client.ImportImage(docker.ImportImageOptions{ | |
| 225ac429 ER |
20 | Repository: prebuiltImageName, |
| 21 | Tag: architecture + "-" + common.REVISION, | |
| 72cef35a ER |
22 | - Source: "-", |
| 23 | - InputStream: bytes.NewBuffer(data), | |
| 24 | + Source: "/var/lib/gitlab-runner/prebuilt-" + architecture + ".tar.xz", | |
| 25 | }) | |
| 26 | if err != nil { | |
| 27 | return |