From 070e8606fa31090765b0d4cf52deda2f7a0e19e9 Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Mon, 11 Jan 2016 15:19:52 +0100 Subject: [PATCH] Use json from box/ --- installer/images/createImage | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/installer/images/createImage b/installer/images/createImage index 83fc85123..8512a2aab 100755 --- a/installer/images/createImage +++ b/installer/images/createImage @@ -7,8 +7,8 @@ assertNotEmpty() { } readonly SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -readonly BOX_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd)" -export JSON="${BOX_DIR}/installer/node_modules/.bin/json" +readonly BOX_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"/../.. && pwd)" +export JSON="${BOX_DIR}/node_modules/.bin/json" provider="digitalocean" installer_revision=$(git rev-parse HEAD) @@ -144,9 +144,8 @@ echo "Copying INFRA_VERSION" $scp22 "${SCRIPT_DIR}/../../setup/INFRA_VERSION" root@${server_ip}:. echo "Copying box source" -cd "${BOX_DIR}/.." -git archive --format=tar HEAD | $ssh22 "root@${server_ip}" "cat - > /tmp/box.tar.gz" cd "${BOX_DIR}" +git archive --format=tar HEAD | $ssh22 "root@${server_ip}" "cat - > /tmp/box.tar.gz" echo "Executing init script" if ! $ssh22 "root@${server_ip}" "/bin/bash /root/initializeBaseUbuntuImage.sh ${installer_revision}"; then