ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2024-12-19 05:37:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #559 from resin-io/558-absolute-qemu

Browse Source 
Make emulated builds reliable in the presence for WORKDIR comands
This commit is contained in:
Tim Perry 2017-06-15 19:41:52 +02:00 committed by GitHub
commit 8efaec63ff
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -24,6 +24,7 @@ and for `resin device init` (same `--config` param)
### Fixed
- Ensure emulated builds use the correct relative path to qemu when called from any location
- Make emulated builds reliable in the presence for WORKDIR comands
## [5.10.2] - 2017-05-31

4
build/utils/docker.js
View File

@ -228,7 +228,7 @@ exports.runBuild = function(params, options, getBundleInfo, logStreams) {
if (options.emulated && platformNeedsQemu()) {
return transpose.transposeTarStream(buildStream, {
hostQemuPath: qemuPath,
containerQemuPath: "./" + QEMU_BIN_NAME
containerQemuPath: "/tmp/" + QEMU_BIN_NAME
});
} else {
return buildStream;
@ -243,7 +243,7 @@ exports.runBuild = function(params, options, getBundleInfo, logStreams) {
if (options.emulated && platformNeedsQemu()) {
buildThroughStream = transpose.getBuildThroughStream({
hostQemuPath: qemuPath,
containerQemuPath: "./" + QEMU_BIN_NAME
containerQemuPath: "/tmp/" + QEMU_BIN_NAME
});
newStream = stream.pipe(buildThroughStream);
} else {

4
lib/utils/docker.coffee
View File

@ -234,7 +234,7 @@ exports.runBuild = (params, options, getBundleInfo, logStreams) ->
if options.emulated and platformNeedsQemu()
return transpose.transposeTarStream buildStream,
hostQemuPath: qemuPath
containerQemuPath: "./#{QEMU_BIN_NAME}"
containerQemuPath: "/tmp/#{QEMU_BIN_NAME}"
else
return buildStream
.then (buildStream) ->
@ -250,7 +250,7 @@ exports.runBuild = (params, options, getBundleInfo, logStreams) ->
if options.emulated and platformNeedsQemu()
buildThroughStream = transpose.getBuildThroughStream
hostQemuPath: qemuPath
containerQemuPath: "./#{QEMU_BIN_NAME}"
containerQemuPath: "/tmp/#{QEMU_BIN_NAME}"
newStream = stream.pipe(buildThroughStream)
else