ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-02-11 21:26:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make emulated builds reliable in the presence for WORKDIR comands

Browse Source 
Connects-To: #558
Change-Type: patch
This commit is contained in:
Tim Perry 2017-06-15 16:36:44 +02:00
parent f465e74a87
commit b756f2a597
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

@ -15,6 +15,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed ### Fixed
- Ensure emulated builds use the correct relative path to qemu when called from any location - 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 ## [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()) { if (options.emulated && platformNeedsQemu()) {
return transpose.transposeTarStream(buildStream, { return transpose.transposeTarStream(buildStream, {
hostQemuPath: qemuPath, hostQemuPath: qemuPath,
containerQemuPath: "./" + QEMU_BIN_NAME containerQemuPath: "/tmp/" + QEMU_BIN_NAME
}); });
} else { } else {
return buildStream; return buildStream;
@ -243,7 +243,7 @@ exports.runBuild = function(params, options, getBundleInfo, logStreams) {
if (options.emulated && platformNeedsQemu()) { if (options.emulated && platformNeedsQemu()) {
buildThroughStream = transpose.getBuildThroughStream({ buildThroughStream = transpose.getBuildThroughStream({
hostQemuPath: qemuPath, hostQemuPath: qemuPath,
containerQemuPath: "./" + QEMU_BIN_NAME containerQemuPath: "/tmp/" + QEMU_BIN_NAME
}); });
newStream = stream.pipe(buildThroughStream); newStream = stream.pipe(buildThroughStream);
} else { } else {

4
lib/utils/docker.coffee
View File

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