jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Use json from box/

Browse Source
This commit is contained in:
Johannes Zellner
2016-01-11 15:19:52 +01:00
parent 511b2848c3
commit 070e8606fa
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
installer/images/createImage
+3 -4
View File
@@ -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