cloudron 4.12.7 → 4.13.0

package/src/appstore-actions.js

@@ -15,8 +15,6 @@ var superagent = require('superagent'),
     exit = helper.exit,
     manifestFormat = require('cloudron-manifestformat');
 
-require('colors');
-
 exports = module.exports = {
     login: login,
     logout: logout,
@@ -67,7 +65,7 @@ function superagentEnd(requestFactory, callback) {
 function authenticate(options, callback) {
     if (!options.hideBanner) {
         const webDomain = config.appStoreOrigin().replace('https://api.', '');
-        console.log(`${webDomain} login`.bold + ` (If you do not have one, sign up at https://${webDomain}/console.html#/register)`);
+        console.log(`${webDomain} login` + ` (If you do not have one, sign up at https://${webDomain}/console.html#/register)`);
     }
 
     var email = options.email || readlineSync.question('Email: ', {});
@@ -79,7 +77,7 @@ function authenticate(options, callback) {
         if (error && !error.response) exit(error);
 
         if (result.statusCode === 401 && result.body.message.indexOf('TOTP') !== -1) {
-            if (result.body.message === 'TOTP token missing') console.log('A 2FA TOTP Token is required for this account.'.red);
+            if (result.body.message === 'TOTP token missing') console.log('A 2FA TOTP Token is required for this account.');
 
             options.totpToken = readlineSync.question('2FA token: ', {});
             options.email = email;
@@ -90,7 +88,7 @@ function authenticate(options, callback) {
         }
 
         if (result.statusCode !== 200) {
-            console.log('Login failed.'.red);
+            console.log('Login failed.');
 
             options.hideBanner = true;
             options.email = '';
@@ -101,7 +99,7 @@ function authenticate(options, callback) {
 
         config.setAppStoreToken(result.body.accessToken);
 
-        console.log('Login successful.'.green);
+        console.log('Login successful.');
 
         if (typeof callback === 'function') callback();
     });
@@ -113,7 +111,7 @@ function login(options) {
 
 function logout() {
     config.setAppStoreToken(null);
-    console.log('Done.'.green);
+    console.log('Done.');
 }
 
 function info(options) {
@@ -123,16 +121,16 @@ function info(options) {
         superagentEnd(function () {
             return superagent.get(createUrl('/api/v1/developers/apps/' + id + '/versions/' + version)).query({ accessToken: config.appStoreToken() });
         }, function (error, result) {
-            if (error && !error.response) exit(util.format('Failed to list apps: %s', error.message.red));
+            if (error && !error.response) exit(util.format('Failed to list apps: %s', error.message));
             if (result.statusCode !== 200) exit(util.format('Failed to list apps: %s message: %s', result.statusCode, result.text));
 
             var manifest = result.body.manifest;
-            console.log('id: %s', manifest.id.bold);
-            console.log('title: %s', manifest.title.bold);
-            console.log('tagline: %s', manifest.tagline.bold);
-            console.log('description: %s', manifest.description.bold);
-            console.log('website: %s', manifest.website.bold);
-            console.log('contactEmail: %s', manifest.contactEmail.bold);
+            console.log('id: %s', manifest.id);
+            console.log('title: %s', manifest.title);
+            console.log('tagline: %s', manifest.tagline);
+            console.log('description: %s', manifest.description);
+            console.log('website: %s', manifest.website);
+            console.log('contactEmail: %s', manifest.contactEmail);
         });
     });
 }
@@ -146,7 +144,7 @@ function listVersions(options) {
         superagentEnd(function () {
             return superagent.get(createUrl('/api/v1/developers/apps/' + id + '/versions')).query({ accessToken: config.appStoreToken() });
         }, function (error, result) {
-            if (error && !error.response) exit(util.format('Failed to list versions: %s', error.message.red));
+            if (error && !error.response) exit(util.format('Failed to list versions: %s', error.message));
             if (result.statusCode === 404) exit('This app is not listed in appstore');
             if (result.statusCode !== 200) exit(util.format('Failed to list versions: %s message: %s', result.statusCode, result.text));
 
@@ -183,13 +181,13 @@ function addApp(manifest, baseDir, callback) {
             .query({ accessToken: config.appStoreToken() })
             .send({ id: manifest.id });
     }, function (error, result) {
-        if (error && !error.response) return exit(util.format('Failed to create app: %s', error.message.red));
+        if (error && !error.response) return exit(util.format('Failed to create app: %s', error.message));
         if (result.statusCode !== 201 && result.statusCode !== 409) {
             return exit(util.format('Failed to create app: %s message: %s', result.statusCode, result.text));
         }
 
         if (result.statusCode === 201) {
-            console.log('New application added to the appstore with id %s.'.green, manifest.id);
+            console.log('New application added to the appstore with id %s.', manifest.id);
         }
 
         callback();
@@ -263,7 +261,7 @@ function addVersion(manifest, baseDir, callback) {
     }, function (error, result) {
         if (error && !error.response) return callback(new Error(util.format('Failed to publish version: %s', error.message)));
         if (result.statusCode === 409) return callback('This version already exists. Use --force to overwrite.');
-        if (result.statusCode !== 204) return callback(new Error(util.format('Failed to publish version (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message.red : result.text)));
+        if (result.statusCode !== 204) return callback(new Error(util.format('Failed to publish version (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message : result.text)));
 
         callback();
     });
@@ -312,7 +310,7 @@ function updateVersion(manifest, baseDir, callback) {
     }, function (error, result) {
         if (error && !error.response) return callback(new Error(util.format('Failed to publish version: %s', error.message)));
         if (result.statusCode !== 204) {
-            return callback(new Error(util.format('Failed to publish version (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message.red : result.text)));
+            return callback(new Error(util.format('Failed to publish version (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message : result.text)));
         }
 
         callback();
@@ -324,7 +322,7 @@ function delVersion(manifest, force) {
     assert(typeof force === 'boolean');
 
     if (!force) {
-        console.log('This will delete the version %s of app %s from the appstore!'.red, manifest.version.bold, manifest.id.bold);
+        console.log('This will delete the version %s of app %s from the appstore!', manifest.version, manifest.id);
         var reallyDelete = readlineSync.question(util.format('Really do this? [y/N]: '), {});
         if (reallyDelete.toUpperCase() !== 'Y') exit();
     }
@@ -332,10 +330,10 @@ function delVersion(manifest, force) {
     superagentEnd(function () {
         return superagent.del(createUrl('/api/v1/developers/apps/' + manifest.id + '/versions/' + manifest.version)).query({ accessToken: config.appStoreToken() });
     }, function (error, result) {
-        if (error && !error.response) return exit(util.format('Failed to unpublish version: %s', error.message.red));
-        if (result.statusCode !== 204) exit(util.format('Failed to unpublish version (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message.red : result.text));
+        if (error && !error.response) return exit(util.format('Failed to unpublish version: %s', error.message));
+        if (result.statusCode !== 204) exit(util.format('Failed to unpublish version (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message : result.text));
 
-        console.log('version unpublished.'.green);
+        console.log('version unpublished.');
     });
 }
 
@@ -348,10 +346,10 @@ function revokeVersion(appstoreId, version) {
             .query({ accessToken: config.appStoreToken() })
             .send({ });
     }, function (error, result) {
-        if (error && !error.response) return exit(util.format('Failed to revoke version: %s', error.message.red));
-        if (result.statusCode !== 200) exit(util.format('Failed to revoke version (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message.red : result.text));
+        if (error && !error.response) return exit(util.format('Failed to revoke version: %s', error.message));
+        if (result.statusCode !== 200) exit(util.format('Failed to revoke version (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message : result.text));
 
-        console.log('version revoked.'.green);
+        console.log('version revoked.');
     });
 }
 
@@ -364,10 +362,10 @@ function approveVersion(appstoreId, version) {
             .query({ accessToken: config.appStoreToken() })
             .send({ });
     }, function (error, result) {
-        if (error && !error.response) return exit(util.format('Failed to approve version: %s', error.message.red));
-        if (result.statusCode !== 200) exit(util.format('Failed to approve version (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message.red : result.text));
+        if (error && !error.response) return exit(util.format('Failed to approve version: %s', error.message));
+        if (result.statusCode !== 200) exit(util.format('Failed to approve version (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message : result.text));
 
-        console.log('Approved.'.green);
+        console.log('Approved.');
         console.log('');
     });
 }
@@ -378,7 +376,7 @@ function delApp(appId, force) {
     assert(typeof force === 'boolean');
 
     if (!force) {
-        console.log('This will delete app %s from the appstore!'.red, appId.bold);
+        console.log('This will delete app %s from the appstore!', appId);
         var reallyDelete = readlineSync.question(util.format('Really do this? [y/N]: '), {});
         if (reallyDelete.toUpperCase() !== 'Y') exit();
     }
@@ -386,10 +384,10 @@ function delApp(appId, force) {
     superagentEnd(function () {
         return superagent.del(createUrl('/api/v1/developers/apps/' + appId)).query({ accessToken: config.appStoreToken() });
     }, function (error, result) {
-        if (error && !error.response) return exit(util.format('Failed to unpublish app: %s', error.message.red));
-        if (result.statusCode !== 204) exit(util.format('Failed to unpublish app (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message.red : result.text));
+        if (error && !error.response) return exit(util.format('Failed to unpublish app: %s', error.message));
+        if (result.statusCode !== 204) exit(util.format('Failed to unpublish app (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message : result.text));
 
-        console.log('App unpublished.'.green);
+        console.log('App unpublished.');
     });
 }
 
@@ -402,14 +400,14 @@ function submitAppForReview(manifest, callback) {
             .query({ accessToken: config.appStoreToken() })
             .send({ });
     }, function (error, result) {
-        if (error && !error.response) exit(util.format('Failed to submit app for review: %s', error.message.red));
+        if (error && !error.response) exit(util.format('Failed to submit app for review: %s', error.message));
         if (result.statusCode === 404) {
-            console.log('No version %s found. Please use %s first.', manifest.version.bold, 'cloudron appstore upload'.cyan);
-            exit('Failed to submit app for review.'.red);
+            console.log('No version %s found. Please use %s first.', manifest.version, 'cloudron appstore upload');
+            exit('Failed to submit app for review.');
         }
-        if (result.statusCode !== 200) return exit(util.format('Failed to submit app (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message.red : result.text));
+        if (result.statusCode !== 200) return exit(util.format('Failed to submit app (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message : result.text));
 
-        console.log('App submitted for review.'.green);
+        console.log('App submitted for review.');
         console.log('You will receive an email when approved.');
 
         callback();
@@ -520,8 +518,8 @@ function listPublishedApps(options) {
             .query({ accessToken: config.appStoreToken() })
             .send({ });
     }, function (error, result) {
-        if (error && !error.response) return exit(util.format('Failed to get list of published apps: %s', error.message.red));
-        if (result.statusCode !== 200) return exit(util.format('Failed to get list of published apps (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message.red : result.text));
+        if (error && !error.response) return exit(util.format('Failed to get list of published apps: %s', error.message));
+        if (result.statusCode !== 200) return exit(util.format('Failed to get list of published apps (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message : result.text));
 
         if (result.body.apps.length === 0) return console.log('No apps published.');
 

package/src/build-actions.js

@@ -43,7 +43,7 @@ function authenticateBuildService(options, callback) {
 
     var buildServiceConfig = config.getBuildServiceConfig();
 
-    if (!options.hideBanner) console.log('Build Service login'.bold + ` (${buildServiceConfig.url}):`);
+    if (!options.hideBanner) console.log('Build Service login' + ` (${buildServiceConfig.url}):`);
 
     var username = options.username || readlineSync.question('Username: ', {});
     var password = options.password || readlineSync.question('Password: ', { noEchoBack: true });
@@ -56,7 +56,7 @@ function authenticateBuildService(options, callback) {
         if (error && !error.response) exit(error);
 
         if (result.statusCode !== 200 && result.statusCode !== 201) {
-            console.log('Login failed.'.red);
+            console.log('Login failed.');
 
             options.hideBanner = true;
             options.username = '';
@@ -68,7 +68,7 @@ function authenticateBuildService(options, callback) {
         buildServiceConfig.token = result.body.accessToken;
         config.setBuildServiceConfig(buildServiceConfig);
 
-        console.log('Login successful.'.green);
+        console.log('Login successful.');
 
         if (typeof callback === 'function') callback();
     });
@@ -120,11 +120,11 @@ function followBuildLog(buildId, raw, callback) {
         if (data.stream) { // build log
             process.stdout.write(data.stream);
         } else if (data.message) {
-            console.log(data.message.yellow.bold);
+            console.log(data.message);
         } else if (data.errorDetail) {
-            console.log(data.errorDetail.message ? data.errorDetail.message.red.bold : data.errorDetail);
+            console.log(data.errorDetail.message ? data.errorDetail.message : data.errorDetail);
         } else if (typeof data.error === 'string') {
-            console.log(data.error.red.bold);
+            console.log(data.error);
         } else if (data.error) {
             console.error(data.error);
         }
@@ -188,16 +188,16 @@ function buildLocal(manifest, sourceDir, appConfig, options) {
 
     if (options.push) {
         console.log();
-        console.log(`Pushing ${dockerImage}`.bold);
+        console.log(`Pushing ${dockerImage}`);
 
         safe.child_process.execSync(`docker push ${dockerImage}`, { stdio: 'inherit' });
-        if (safe.error) exit('Failed to push image (are you logged in? if not, use "docker login")'.red);
+        if (safe.error) exit('Failed to push image (are you logged in? if not, use "docker login")');
     }
 
     let result = safe.child_process.execSync(`docker inspect --format="{{index .RepoDigests 0}}" ${dockerImage}`, { encoding: 'utf8' });
-    if (safe.error) exit('Failed to inspect image'.red);
+    if (safe.error) exit('Failed to inspect image');
     let match = /.*@sha256:(.*)/.exec(result.trim());
-    if (!match) exit('Failed to detect sha256'.red);
+    if (!match) exit('Failed to detect sha256');
 
     appConfig.dockerImage = `${dockerImage}`;
     appConfig.dockerImageSha256 = match[1]; // stash this separately for now
@@ -205,7 +205,7 @@ function buildLocal(manifest, sourceDir, appConfig, options) {
 }
 
 function buildRemote(manifest, sourceDir, appConfig, options) {
-    console.log('Using build service', config.getBuildServiceConfig().url.cyan);
+    console.log('Using build service', config.getBuildServiceConfig().url);
 
     let tag;
     if (options.tag) {
@@ -219,7 +219,7 @@ function buildRemote(manifest, sourceDir, appConfig, options) {
 
     const dockerImage = `${appConfig.repository}:${tag}`;
 
-    console.log('Building %s', dockerImage.bold);
+    console.log('Building %s', dockerImage);
 
     var sourceArchiveFilePath = path.join(os.tmpdir(), path.basename(sourceDir) + '.tar.gz');
     var dockerignoreFilePath = path.join(sourceDir, '.dockerignore');
@@ -259,9 +259,9 @@ function buildRemote(manifest, sourceDir, appConfig, options) {
                 .field('buildArgs', JSON.stringify(buildArgsObject))
                 .attach('sourceArchive', sourceArchiveFilePath);
         }, function (error, result) {
-            if (error && !error.response) return exit(util.format('Failed to build app: %s', error.message.red));
-            if (result.statusCode === 413) exit('Failed to build app. The app source is too large.\nPlease adjust your .dockerignore file to only include neccessary files.'.red);
-            if (result.statusCode !== 201) exit(util.format('Failed to build app (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message.red : result.text));
+            if (error && !error.response) return exit(util.format('Failed to build app: %s', error.message));
+            if (result.statusCode === 413) exit('Failed to build app. The app source is too large.\nPlease adjust your .dockerignore file to only include neccessary files.');
+            if (result.statusCode !== 201) exit(util.format('Failed to build app (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message : result.text));
 
             var buildId = result.body.id;
 
@@ -273,16 +273,16 @@ function buildRemote(manifest, sourceDir, appConfig, options) {
                     return superagent.get(`${buildServiceConfig.url}/api/v1/builds/${buildId}`)
                         .query({ accessToken: buildServiceConfig.token });
                 }, function (error, result) {
-                    if (error && !error.response) return exit(util.format('Failed to build app: %s', error.message.red));
-                    if (result.statusCode !== 200) exit(util.format('Failed to build app (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message.red : result.text));
-                    if (result.body.status !== 'success') exit('Failed to build app. See log output above.'.red);
+                    if (error && !error.response) return exit(util.format('Failed to build app: %s', error.message));
+                    if (result.statusCode !== 200) exit(util.format('Failed to build app (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message : result.text));
+                    if (result.body.status !== 'success') exit('Failed to build app. See log output above.');
 
                     appConfig.dockerImage = dockerImage;
                     // appConfig.dockerImageSha256 = match[1]; // stash this separately for now
                     config.setAppConfig(sourceDir, appConfig);
 
-                    console.log(dockerImage.bold);
-                    console.log('\nBuild successful'.green);
+                    console.log(dockerImage);
+                    console.log('\nBuild successful');
 
                     exit();
                 });
@@ -299,7 +299,7 @@ function build(options) {
     if (!manifestFilePath) return exit('No CloudronManifest.json found');
 
     const result = manifestFormat.parseFile(manifestFilePath);
-    if (result.error) return exit('Error in CloudronManifest.json: ' + result.error.message.red);
+    if (result.error) return exit('Error in CloudronManifest.json: ' + result.error.message);
 
     let manifest = result.manifest;
     const sourceDir = path.dirname(manifestFilePath);
@@ -336,7 +336,7 @@ function build(options) {
         if (typeof options.setRepository === 'string') {
             repository = options.setRepository;
         } else {
-            repository = readlineSync.question(`Enter repository (e.g registry/username/${manifest.id || path.basename(sourceDir)}): `, {});
+            repository = readlineSync.question(`Enter docker repository (e.g registry/username/${manifest.id || path.basename(sourceDir)}): `, {});
             if (!repository) exit('No repository provided');
             console.log();
         }

package/src/completion.js

@@ -5,8 +5,6 @@
 var helper = require('./helper.js'),
     util = require('util');
 
-require('colors');
-
 exports = module.exports = function (options) {
     var completion = '';
 

package/src/helper.js

@@ -14,8 +14,8 @@ exports = module.exports = {
 };
 
 function exit(error) {
-    if (error instanceof Error) console.log(error.message.red);
-    else if (error) console.log(util.format.apply(null, Array.prototype.slice.call(arguments)).red);
+    if (error instanceof Error) console.log(error.message);
+    else if (error) console.log(util.format.apply(null, Array.prototype.slice.call(arguments)));
 
     process.exit(error ? 1 : 0);
 }

package/src/templates/Dockerfile.ejs

@@ -1,3 +1,3 @@
-FROM cloudron/base:3.0.0@sha256:455c70428723e3a823198c57472785437eb6eab082e79b3ff04ea584faf46e92
+FROM cloudron/base:3.1.0@sha256:eb2ab9c7d361acda2f3ef2d8388154bc48f1651b5013fe6de4beea003018e427
 
 EXPOSE <%- httpPort %>