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

Let the cloudron-version tool resolve the version string

Browse Source
This commit is contained in:
Johannes
2016-10-25 13:12:26 +02:00
parent 2ca5b3c197
commit 6660ef2ff3
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/cloudron-setup
View File

@@ -13,7 +13,7 @@ restoreKey=""
restoreUrl=""
tlsProvider="letsencrypt-prod"
versionsUrl="https://s3.amazonaws.com/prod-cloudron-releases/versions.json"
version=""
version="latest"
args=$(getopt -o "" -l "domain:,provider:,restore-key:,restore-url:,tls-provider:,version:,versions-url:" -n "$0" -- "$@")
eval set -- "${args}"
@@ -44,6 +44,13 @@ echo "Installing dependancies"
/bin/bash /tmp/initializeBaseUbuntuImage.sh "${INSTALLER_REVISION}" "${provider}"
rm /tmp/initializeBaseUbuntuImage.sh
# start the update server
systemctl start cloudron-installer
echo "Get sourcetarball url from version"
sourceTarballUrl=$(cloudron-version --out tarballUrl --versions-url "${versionsUrl}" --version "${version}")
version=$(cloudron-version --out version --versions-url "${versionsUrl}" --version "${version}")
read -d '' data <<EOF
{
"data": {
@@ -60,12 +67,6 @@ read -d '' data <<EOF
}
EOF
# start the update server
systemctl start cloudron-installer
echo "Get sourcetarball url from version"
sourceTarballUrl=$(cloudron-version --out tarballUrl --versions-url "${versionsUrl}" --version "${version}")
echo "Run installer.sh with ${sourceTarballUrl}"
${INSTALLER_SOURCE_DIR}/src/scripts/installer.sh --sourcetarballurl "${sourceTarballUrl}" --data "${data}"