Decouple installer from the base image script

This means that the base image does not have the installer anymore
and needs to be copied over.

Part of #152
This commit is contained in:
Girish Ramakrishnan
2016-12-23 16:38:46 -08:00
parent 7e592f34bd
commit fae0ba5678
6 changed files with 20 additions and 42 deletions

View File

@@ -7,7 +7,7 @@ if [[ ${EUID} -ne 0 ]]; then
exit 1
fi
readonly INSTALLER_SOURCE_DIR="/home/yellowtent/installer"
readonly INSTALLER_PATH="/etc/installer.sh"
readonly UPDATER_SERVICE="cloudron-updater"
readonly DATA_FILE="/tmp/cloudron-update-data.json"
@@ -36,7 +36,7 @@ fi
echo "${data}" > "${DATA_FILE}"
echo "=> Run installer.sh as cloudron-updater.service"
if ! systemd-run --unit "${UPDATER_SERVICE}" ${INSTALLER_SOURCE_DIR}/scripts/installer.sh --sourcetarballurl "${sourceTarballUrl}" --data-file "${DATA_FILE}"; then
if ! systemd-run --unit "${UPDATER_SERVICE}" ${INSTALLER_PATH} --sourcetarballurl "${sourceTarballUrl}" --data-file "${DATA_FILE}"; then
echo "Failed to install cloudron. See ${LOG_FILE} for details"
exit 1
fi