]>
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 | ||
ac49da77 ER |
7 | --- 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 |
8 | +++ 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 | |
9 | @@ -222,17 +222,11 @@ | |
ec1f413c | 10 | return &image, nil |
72cef35a ER |
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...") | |
ec1f413c ER |
19 | |
20 | ref := prebuiltImageName | |
21 | source := types.ImageImportSource{ | |
22 | - Source: bytes.NewBuffer(data), | |
ac49da77 ER |
23 | - SourceName: "-", |
24 | + SourceName: "/var/lib/gitlab-runner/prebuilt-" + architecture + ".tar.xz", | |
ec1f413c ER |
25 | } |
26 | options := types.ImageImportOptions{ | |
ac49da77 | 27 | Tag: architecture + "-" + common.REVISION, |