Comparing version 0.0.5 to 0.0.6
{ | ||
"name": "barque", | ||
"version": "0.0.5", | ||
"version": "0.0.6", | ||
"description": "barque CLI", | ||
@@ -5,0 +5,0 @@ "bin": { |
@@ -16,5 +16,20 @@ function buildImageName(settings, version) { | ||
} | ||
function buildCMD(image, npmToken, envMode) { | ||
function buildPlatform(env) { | ||
let platform = "linux/amd64" | ||
try { | ||
if (env.platform) { | ||
platform = env.platform | ||
} | ||
} catch(e) { | ||
console.log('error accessing platform key from env') | ||
console.log(env); | ||
} | ||
return `--platform=${platform}` | ||
} | ||
function buildCMD(image, env, npmToken, envMode) { | ||
let args = buildArgs(npmToken, envMode) | ||
let cmd = `docker build -t ${image}` | ||
let platform = buildPlatform(env) | ||
let cmd = `docker build ${platform} -t ${image}` | ||
if (args) { | ||
@@ -26,4 +41,4 @@ cmd += " " + args | ||
} | ||
async function build(tb, image, npmToken, envMode) { | ||
let cmd = buildCMD(image, npmToken, envMode) | ||
async function build(tb, image, settings, npmToken, envMode) { | ||
let cmd = buildCMD(image, settings, npmToken, envMode) | ||
tb.print.info(cmd) | ||
@@ -41,5 +56,5 @@ let output = await tb.system.run(cmd) | ||
async function dockerPackage(tb, version, settings, npmToken, envMode) { | ||
async function dockerPackage(tb, version, settings, env, npmToken, envMode) { | ||
let image = buildImageName(settings, version) | ||
await build(tb, image, npmToken, envMode) | ||
await build(tb, image, env, npmToken, envMode) | ||
return image | ||
@@ -46,0 +61,0 @@ } |
@@ -46,3 +46,3 @@ const verifyAcceptedBranch = require('./branch') | ||
await verifyAcceptedBranch(tb, mode, env) | ||
let image = await dockerBuild(tb, version, settings, npmToken, mode) | ||
let image = await dockerBuild(tb, version, settings, env, npmToken, mode) | ||
if (!skipDockerPush) { | ||
@@ -49,0 +49,0 @@ await dockerPush(tb, image) |
15807
371