diff --git a/scripts/cloudron-setup b/scripts/cloudron-setup index 7d1840f8f..5d2984832 100755 --- a/scripts/cloudron-setup +++ b/scripts/cloudron-setup @@ -48,14 +48,13 @@ edition="" requestedVersion="" apiServerOrigin="https://api.cloudron.io" webServerOrigin="https://cloudron.io" -prerelease="false" sourceTarballUrl="" rebootServer="true" baseDataDir="" echo "Running cloudron-setup with args : $@" > "${LOG_FILE}" -args=$(getopt -o "" -l "help,skip-baseimage-init,data-dir:,provider:,version:,env:,prerelease,edition:,skip-reboot" -n "$0" -- "$@") +args=$(getopt -o "" -l "help,skip-baseimage-init,data-dir:,provider:,version:,env:,edition:,skip-reboot" -n "$0" -- "$@") eval set -- "${args}" while true; do @@ -68,16 +67,13 @@ while true; do if [[ "$2" == "dev" ]]; then apiServerOrigin="https://api.dev.cloudron.io" webServerOrigin="https://dev.cloudron.io" - prerelease="true" elif [[ "$2" == "staging" ]]; then apiServerOrigin="https://api.staging.cloudron.io" webServerOrigin="https://staging.cloudron.io" - prerelease="true" fi shift 2;; --skip-baseimage-init) initBaseImage="false"; shift;; --skip-reboot) rebootServer="false"; shift;; - --prerelease) prerelease="true"; shift;; --data-dir) baseDataDir=$(realpath "$2"); shift 2;; --) break;; *) echo "Unknown option $1"; exit 1;; @@ -155,7 +151,7 @@ if [[ "${initBaseImage}" == "true" ]]; then fi echo "=> Checking version" -if ! releaseJson=$($curl -s "${apiServerOrigin}/api/v1/releases?prerelease=${prerelease}&boxVersion=${requestedVersion}"); then +if ! releaseJson=$($curl -s "${apiServerOrigin}/api/v1/releases?boxVersion=${requestedVersion}"); then echo "Failed to get release information" exit 1 fi diff --git a/src/settings.js b/src/settings.js index 1ece0fd86..a88186802 100644 --- a/src/settings.js +++ b/src/settings.js @@ -90,7 +90,7 @@ var gDefaults = (function () { retentionSecs: 2 * 24 * 60 * 60, // 2 days intervalSecs: 24 * 60 * 60 // ~1 day }; - result[exports.UPDATE_CONFIG_KEY] = { prerelease: false }; + result[exports.UPDATE_CONFIG_KEY] = {}; result[exports.APPSTORE_CONFIG_KEY] = {}; result[exports.CAAS_CONFIG_KEY] = {}; result[exports.EMAIL_DIGEST] = true; diff --git a/src/test/updatechecker-test.js b/src/test/updatechecker-test.js index 70deeefa2..666d40082 100644 --- a/src/test/updatechecker-test.js +++ b/src/test/updatechecker-test.js @@ -128,29 +128,6 @@ describe('updatechecker - box - manual (email)', function () { }); }); - it('offers prerelease', function (done) { - nock.cleanAll(); - - var scope = nock('http://localhost:4444') - .get('/api/v1/users/uid/cloudrons/cid/boxupdate') - .query({ boxVersion: config.version(), accessToken: 'token' }) - .reply(200, { version: '2.0.0-pre.0', changelog: [''], sourceTarballUrl: '2.0.0-pre.0.tar.gz' } ); - - var scope2 = nock('http://localhost:4444') - .get('/api/v1/users/uid/cloudrons/cid/subscription') - .query({ accessToken: 'token' }) - .reply(200, { subscription: { plan: { id: 'pro' } } } ); - - updatechecker.checkBoxUpdates(function (error) { - expect(!error).to.be.ok(); - expect(updatechecker.getUpdateInfo().box.version).to.be('2.0.0-pre.0'); - expect(scope.isDone()).to.be.ok(); - expect(scope2.isDone()).to.be.ok(); - - checkMails(1, done); - }); - }); - it('bad response offers nothing', function (done) { nock.cleanAll(); diff --git a/src/updater.js b/src/updater.js index c01e64afd..fd068c21b 100644 --- a/src/updater.js +++ b/src/updater.js @@ -123,9 +123,6 @@ function verifyUpdateInfo(versionsFile, updateInfo, callback) { assert.strictEqual(typeof updateInfo, 'object'); assert.strictEqual(typeof callback, 'function'); - // skip verification for prereleases because we remove it from release.json - if (semver.prerelease(config.version()) !== null) return callback(); - var releases = safe.JSON.parse(safe.fs.readFileSync(versionsFile, 'utf8')) || { }; if (!releases[config.version()] || !releases[config.version()].next) return callback(new UpdaterError(UpdaterError.EXTERNAL_ERROR, 'No version info')); var nextVersion = releases[config.version()].next;