cloudron 5.15.0 → 5.16.1

package/CHANGELOG.md

@@ -0,0 +1,44 @@
+
+[5.14.0]
+* Replace superagent module with own implementation.
+
+[5.14.1]
+* fix usage of request.attach
+
+[5.14.2]
+* superagent does not return stream anymore
+
+[5.14.3]
+* Handle case where info subcommand reveals no published versions
+* Add better error message if a URL with protocol was set as build repository
+
+[5.14.4]
+* fixes crash in safetydance when execSync returns null
+
+[5.14.5]
+* case insensitive compare
+
+[5.14.6]
+* Fix typo in appstore notifications
+
+[5.14.7]
+* Update base image in template
+
+[5.14.8]
+* Always send a request body on POST
+* Ensure we send an object on uninstall to enforce the expected content-type
+
+[5.14.9]
+* check image in docker registry instead of docker hub web page since docker hub is down
+
+[5.14.10]
+* Use custom namespace for our packages - @cloudron/manifest-format , @cloudron/superagent
+* add install `--memory-limit`
+
+[5.15.0]
+* decrypt-dir: option to disable filename decryption
+* Add `--env` to install
+
+[5.16.0]
+* build: output the selected Dockerfile name
+

package/bin/cloudron

@@ -290,19 +290,5 @@ program.command('update')
     .option('--no-force', 'Match appstore id and manifest id before updating', true)
     .action(actions.update);
 
-(async function main() {
-    // completion is useful in shell configs, so don't block here
-    if (process.argv[2] !== 'completion') {
-        if (Date.now() - (config.get('lastCliUpdateCheck') || 0) > 24*60*60*1000) {
-            // check if cli tool is up-to-date
-            const [error, response] = await safe(superagent.get('https://registry.npmjs.org/cloudron').retry(0).ok(() => true));
-            if (!error && response.status === 200 && response.body['dist-tags'].latest !== version) {
-                const updateCommand = 'npm install -g cloudron@' + response.body['dist-tags'].latest;
-                process.stderr.write(util.format('A new version of Cloudron CLI is available. Please update with: %s\n', updateCommand));
-            }
-            config.set('lastCliUpdateCheck', Date.now());
-        }
-    }
-
-    program.parse(process.argv);
-})();
+program.parse(process.argv);
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "5.15.0",
+  "version": "5.16.1",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -17,25 +17,25 @@
   },
   "author": "Cloudron Developers <support@cloudron.io>",
   "dependencies": {
-    "@cloudron/manifest-format": "^5.27.0",
+    "@cloudron/manifest-format": "^5.28.0",
     "@cloudron/superagent": "^1.0.0",
     "commander": "^13.1.0",
-    "debug": "^4.4.0",
+    "debug": "^4.4.1",
     "easy-table": "^1.2.0",
     "ejs": "^3.1.10",
-    "eventsource": "^3.0.6",
+    "eventsource": "^3.0.7",
     "micromatch": "^4.0.8",
-    "open": "^10.1.1",
+    "open": "^10.2.0",
     "safetydance": "^2.5.1",
-    "tar-fs": "^3.0.8"
+    "tar-fs": "^3.1.0"
   },
   "engines": {
     "node": ">= 18.x.x"
   },
   "devDependencies": {
-    "@eslint/js": "^9.25.1",
-    "eslint": "^9.25.1",
+    "@eslint/js": "^9.32.0",
+    "eslint": "^9.32.0",
     "expect.js": "^0.3.1",
-    "mocha": "^11.1.0"
+    "mocha": "^11.7.1"
   }
 }

package/src/actions.js

@@ -1238,10 +1238,12 @@ async function importApp(localOptions, cmd) {
             }
 
             if (backupKey) data.backupConfig.key = backupKey;
+        } else {
+            data.inPlace = true;
         }
 
         const request = createRequest('POST', `/api/v1/apps/${app.id}/import`, options);
-        const response = await request.send({});
+        const response = await request.send(data);
         if (response.status !== 202) return exit(`Failed to import app: ${requestError(response)}`);
 
         await waitForFinishInstallation(app.id, response.body.taskId, options);

package/src/build-actions.js

@@ -25,7 +25,7 @@ const assert = require('assert'),
     stream = require('stream/promises'),
     superagent = require('@cloudron/superagent'),
     tar = require('tar-fs'),
-    url = require('url');
+    { URL } = require('url');
 
 function requestError(response) {
     if (response.status === 401 || response.status === 403) return 'Invalid token. Use cloudron build login again.';
@@ -86,11 +86,16 @@ async function followBuildLog(buildId, raw) {
     assert.strictEqual(typeof buildId, 'string');
     assert.strictEqual(typeof raw, 'boolean');
 
-    // EventSource always requires http
-    let tmp = url.parse(config.getBuildServiceConfig().url);
-    if (tmp.protocol !== 'https:' && tmp.protocol !== 'http:') tmp = url.parse('http://' + config.getBuildServiceConfig().url);
+    const rawUrl = config.getBuildServiceConfig().url;
+    let tmp;
+    try {
+        tmp = new URL(rawUrl);
+    } catch {
+        tmp = new URL(`http://${rawUrl}`);  // if it fails, prepend http://
+    }
+
+    const es = new EventSource(`${tmp.origin}/api/v1/builds/${buildId}/logstream?accessToken=${config.getBuildServiceConfig().token}`);
 
-    const es = new EventSource(`${tmp.href}api/v1/builds/${buildId}/logstream?accessToken=${config.getBuildServiceConfig().token}`);
     let prevId = null, prevWasStatus = false;
 
     es.addEventListener('message', function (e) {
@@ -195,16 +200,16 @@ async function buildLocal(manifest, sourceDir, appConfig, options) {
     }
 
     const dockerImage = `${appConfig.repository}:${tag}`;
-
-    console.log('Building locally as %s', dockerImage);
-    console.log();
-
     const buildArgsCmdLine = options.buildArg.map(function (a) { return `--build-arg "${a}"`; }).join(' ');
 
     let dockerfile = 'Dockerfile';
     if (options.file) dockerfile = options.file;
     else if (fs.existsSync(`${sourceDir}/Dockerfile.cloudron`)) dockerfile = 'Dockerfile.cloudron';
     else if (fs.existsSync(`${sourceDir}/cloudron/Dockerfile`)) dockerfile = 'cloudron/Dockerfile';
+
+    console.log(`Building ${dockerfile} locally as ${dockerImage}`);
+    console.log();
+
     execSync(`docker build ${!options.cache ? '--no-cache' : ''} -t ${dockerImage} -f ${dockerfile} ${buildArgsCmdLine} ${sourceDir}`, { stdio: 'inherit' });
 
     if (options.push) {
@@ -240,13 +245,20 @@ async function buildRemote(manifest, sourceDir, appConfig, options) {
 
     const dockerImage = `${appConfig.repository}:${tag}`;
 
-    console.log('Building %s', dockerImage);
+    let dockerfile = 'Dockerfile';
+    if (options.file) dockerfile = options.file;
+    else if (fs.existsSync(`${sourceDir}/Dockerfile.cloudron`)) dockerfile = 'Dockerfile.cloudron';
+    else if (fs.existsSync(`${sourceDir}/cloudron/Dockerfile`)) dockerfile = 'cloudron/Dockerfile';
+
+    const buildServiceConfig = config.getBuildServiceConfig();
+
+    console.log(`Building ${dockerfile} as ${dockerImage}`);
 
     const sourceArchiveFilePath = path.join(os.tmpdir(), path.basename(sourceDir) + '.tar.gz');
     const dockerignoreFilePath = path.join(sourceDir, '.dockerignore');
     const ignoreMatcher = dockerignoreMatcher(dockerignoreFilePath);
 
-    console.log('Uploading source tarball...');
+    console.log(`Uploading source tarball to ${buildServiceConfig.url} ...`);
 
     const tarStream = tar.pack(sourceDir, {
         ignore: function (name) {
@@ -258,11 +270,6 @@ async function buildRemote(manifest, sourceDir, appConfig, options) {
     const [tarError] = await safe(stream.pipeline(tarStream, sourceArchiveStream));
     if (tarError) return exit(`Could not tar: ${tarError.message}`);
 
-    let dockerfile = 'Dockerfile';
-    if (options.file) dockerfile = options.file;
-    else if (fs.existsSync(`${sourceDir}/Dockerfile.cloudron`)) dockerfile = 'Dockerfile.cloudron';
-    else if (fs.existsSync(`${sourceDir}/cloudron/Dockerfile`)) dockerfile = 'cloudron/Dockerfile';
-
     const buildArgsObject = {};
     options.buildArg.forEach(function (a) {
         const key = a.slice(0, a.indexOf('='));
@@ -270,7 +277,6 @@ async function buildRemote(manifest, sourceDir, appConfig, options) {
         buildArgsObject[key] = value;
     });
 
-    const buildServiceConfig = config.getBuildServiceConfig();
     const response = await superagent.post(`${buildServiceConfig.url}/api/v1/builds`)
         .query({ accessToken: buildServiceConfig.token, noCache: !options.cache, dockerfile: dockerfile, noPush: !options.push })
         .field('dockerImageRepo', appConfig.repository)