From 7696bed8a9efd05acfcfb87d9c9d6e72de9b9ee5 Mon Sep 17 00:00:00 2001 From: itowlson Date: Thu, 28 Feb 2019 10:53:35 +1300 Subject: [PATCH] Duffle 0.0.5 compatibility updates (#55) --- app/utils/duffle.ts | 4 ++-- data/bundle.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/utils/duffle.ts b/app/utils/duffle.ts index 7f35406..27d930f 100644 --- a/app/utils/duffle.ts +++ b/app/utils/duffle.ts @@ -105,11 +105,11 @@ export async function pushFile(sh: shell.Shell, filePath: string, repo: string): } export async function installFile(sh: shell.Shell, bundleFilePath: string, name: string, params: { [key: string]: string }, credentialSet: string | undefined): Promise> { - return await invokeObj(sh, 'install', `${name} --insecure -f "${bundleFilePath}" ${paramsArgs(params)} ${credentialArg(credentialSet)}`, {}, (s) => s); + return await invokeObj(sh, 'install', `${name} "${bundleFilePath}" -f ${paramsArgs(params)} ${credentialArg(credentialSet)} --insecure`, {}, (s) => s); } export async function installBundle(sh: shell.Shell, bundleName: string, name: string, params: { [key: string]: string }, credentialSet: string | undefined): Promise> { - return await invokeObj(sh, 'install', `${name} ${bundleName} --insecure ${paramsArgs(params)} ${credentialArg(credentialSet)}`, {}, (s) => s); + return await invokeObj(sh, 'install', `${name} ${bundleName} ${paramsArgs(params)} ${credentialArg(credentialSet)} --insecure`, {}, (s) => s); } export async function verifyFile(sh: shell.Shell, bundleFilePath: string): Promise> { diff --git a/data/bundle.json b/data/bundle.json index b2e56c3..f7fd30c 100644 --- a/data/bundle.json +++ b/data/bundle.json @@ -7,12 +7,12 @@ "image": "cnab/helloworld:0.1.1" } ], - "images": [ - { - "imageType": "docker", + "images": { + "box-of-bizness": { + "description": "SO VERY BUSY", "image": "busybox" } - ], + }, "parameters": { "port": { "defaultValue": 8080,