cloudron 7.0.0 → 7.0.2

package/bin/cloudron

@@ -19,8 +19,9 @@ program.version(pkg.version);
 // global options
 program.option('--server <server>', 'Cloudron domain')
     .option('--token <token>', 'Cloudron token')
-    .option('--allow-selfsigned', 'Accept self signed SSL certificate')
-    .option('--accept-selfsigned', 'Accept self signed SSL certificate');
+    .option('--allow-selfsigned', 'Accept self signed SSL certificate') // do not removed, used in e2e!
+    .option('--accept-selfsigned', 'Accept self signed SSL certificate')
+    .option('--no-wait', 'Do not wait for the operation to finish');
 
 // these are separate binaries since global options are not applicable
 program.command('appstore', 'Cloudron appstore commands');
@@ -158,7 +159,6 @@ program.command('init')
 program.command('install')
     .description('Install or update app')
     .option('--image <docker image>', 'Docker image')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .option('-p, --port-bindings [PORT=port,...]', 'Query/Set port bindings')
     .option('-l, --location <domain>', 'Subdomain or full domain')
     .option('-s, --secondary-domains [DOMAIN=domain,...]', 'Set secondary domains')
@@ -226,26 +226,22 @@ program.command('repair')
     .description('Repair an installed application (re-configure)')
     .option('--app <id/location>', 'App id or location')
     .option('--image <docker image>', 'Docker image')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .action(actions.repair);
 
 program.command('restore')
     .description('Restore app from known backup')
     .option('--app <id/location>', 'App id or location')
     .option('--backup <backup>', 'Backup id')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .action(actions.restore);
 
 program.command('restart')
     .description('Restart an installed application')
     .option('--app <id/location>', 'App id or location')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .action(actions.restart);
 
 program.command('set-location')
     .description('Set the location of an app')
     .option('--app <id/location>', 'App id or location')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .option('-p, --port-bindings [PORT=port,...]', 'Query port bindings')
     .option('-l, --location <location>', 'Location')
     .option('-s, --secondary-domains [DOMAIN=domain,...]', 'Query/Set secondary domains')
@@ -256,7 +252,6 @@ program.command('set-location')
 program.command('start')
     .description('Start an installed application')
     .option('--app <id/location>', 'App id or location')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .action(actions.start);
 
 program.command('stop')
@@ -280,7 +275,6 @@ program.command('update')
     .option('--appstore-id <appid[@version]>', 'Use app from the store')
     .option('--image <docker image>', 'Docker image')
     .option('--no-backup', 'Skip backup [false]')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .option('--no-force', 'Match appstore id and manifest id before updating', true)
     .action(actions.update);
 

package/bin/cloudron-build

@@ -26,7 +26,7 @@ program.command('build', { isDefault: true })
     .description('Build an app. This is the default subcommand')
     .option('--build-arg <namevalue>', 'Build arg passed to docker. Can be used multiple times', collectArgs, [])
     .option('-f, --file <dockerfile>', 'Name of the Dockerfile')
-    .option('--set-repository [repository url]', 'Change the repository. This url is stored for future builds for this project. e.g registry/username/projectname')
+    .option('--repository [repository url]', 'Change the repository. This url is stored for future builds for this project. e.g registry/username/projectname')
     .option('--no-cache', 'Do not use cache')
     .option('--no-push', 'Do not push built image to registry')
     .option('--raw', 'Raw output build log')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "type": "module",

package/src/actions.js

@@ -266,7 +266,7 @@ async function stopApp(app, options) {
     const response = await request.send({});
     if (response.status !== 202) throw `Failed to stop app: ${requestError(response)}`;
 
-    await waitForTask(response.body.taskId, options);
+    return response.body.taskId;
 }
 
 async function startApp(app, options) {
@@ -277,7 +277,7 @@ async function startApp(app, options) {
     const response = await request.send({});
     if (response.status !== 202) throw `Failed to start app: ${requestError(response)}`;
 
-    await waitForTask(response.body.taskId, options);
+    return response.body.taskId;
 }
 
 async function restartApp(app, options) {
@@ -288,7 +288,7 @@ async function restartApp(app, options) {
     const response = await request.send({});
     if (response.status !== 202) throw `Failed to restart app: ${requestError(response)}`;
 
-    await waitForTask(response.body.taskId, options);
+    return response.body.taskId;
 }
 
 async function authenticate(adminFqdn, username, password, options) {
@@ -722,6 +722,8 @@ async function install(localOptions, cmd) {
 
         console.log('App is being installed.');
 
+        if (!options.wait) return;
+
         await waitForFinishInstallation(appId, response.body.taskId, options);
         console.log('\n\nApp is installed.');
     } catch (error) {
@@ -815,6 +817,8 @@ async function setLocation(localOptions, cmd) {
         const response = await request.send(data);
         if (response.status !== 202) return exit(`Failed to configure app: ${requestError(response)}`);
 
+        if (!options.wait) return;
+
         await waitForTask(response.body.taskId, options);
         await waitForHealthy(app.id, options);
         console.log('\n\nApp configured');
@@ -924,6 +928,8 @@ async function debugApp(args, localOptions, cmd) {
         const response = await request.send(data);
         if (response.status !== 202) return exit(`Failed to set debug mode: ${requestError(response)}`);
 
+        if (!options.wait) return;
+
         await waitForTask(response.body.taskId, options);
 
         const memoryLimit = options.limitMemory ? 0 : -1;
@@ -958,6 +964,8 @@ async function repair(localOptions, cmd) {
         const response = await request.send(data);
         if (response.status !== 202) return exit(`Failed to set repair mode: ${requestError(response)}`);
 
+        if (!options.wait) return;
+
         process.stdout.write('\n => ' + 'Waiting for app to be repaired ');
 
         await waitForFinishInstallation(app.id, response.body.taskId, options);
@@ -992,6 +1000,8 @@ async function uninstall(localOptions, cmd) {
         const response = await request.send({});
         if (response.status !== 202) return exit(`Failed to uninstall app: ${requestError(response)}`);
 
+        if (!options.wait) return;
+
         process.stdout.write('\n => ' + 'Waiting for app to be uninstalled ');
 
         await waitForTask(response.body.taskId, options);
@@ -1117,7 +1127,9 @@ async function restart(localOptions, cmd) {
         const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
-        await restartApp(app, options);
+        const taskId = await restartApp(app, options);
+        if (!options.wait) return;
+        await waitForTask(taskId, options);
         await waitForHealthy(app.id, options);
         console.log('\n\nApp restarted');
     } catch (error) {
@@ -1130,7 +1142,9 @@ async function start(localOptions, cmd) {
         const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
-        await startApp(app, options);
+        const taskId = await startApp(app, options);
+        if (!options.wait) return;
+        await waitForTask(taskId, options);
         await waitForHealthy(app.id, options);
         console.log('\n\nApp started');
     } catch (error) {
@@ -1143,7 +1157,9 @@ async function stop(localOptions, cmd) {
         const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
-        await stopApp(app, options);
+        const taskId = await stopApp(app, options);
+        if (!options.wait) return;
+        await waitForTask(taskId, options);
         console.log('\n\nApp stopped');
     } catch (error) {
         exit(error);
@@ -1169,6 +1185,8 @@ async function backupCreate(localOptions, cmd) {
         const response = await request.send({ backupSiteId });
         if (response.status !== 202) return exit(`Failed to start backup: ${requestError(response)}`);
 
+        if (!options.wait) return;
+
         // FIXME: this should be waitForHealthCheck but the box code incorrectly modifies the installationState
         await waitForFinishBackup(app.id, response.body.taskId, options);
         console.log('\n\nApp is backed up');

package/src/build-actions.js

@@ -16,6 +16,20 @@ import stream from 'stream/promises';
 import superagent from '@cloudron/superagent';
 import tar from 'tar-fs';
 
+function getEffectiveBuildServiceConfig(options) {
+    const buildServiceConfig = config.getBuildServiceConfig();
+
+    if (options.buildServiceUrl) {
+        buildServiceConfig.type = 'remote';
+        buildServiceConfig.url = options.buildServiceUrl;
+        if (buildServiceConfig.url.indexOf('://') === -1) buildServiceConfig.url = `https://${buildServiceConfig.url}`;
+    }
+
+    if (options.buildServiceToken) buildServiceConfig.token = options.buildServiceToken;
+
+    return buildServiceConfig;
+}
+
 function requestError(response) {
     if (response.status === 401 || response.status === 403) return 'Invalid token. Use cloudron build login again.';
 
@@ -26,9 +40,9 @@ function requestError(response) {
 async function login(localOptions, cmd) {
     const options = cmd.optsWithGlobals();
 
-    const buildServiceConfig = config.getBuildServiceConfig();
+    const buildServiceConfig = getEffectiveBuildServiceConfig(options);
 
-    let url = options.buildServiceUrl || buildServiceConfig.url;
+    let url = buildServiceConfig.url;
     if (!url) {
         url = await readline.question('Build Service URL: ', {});
         if (!url) return exit('No build service URL provided.');
@@ -37,7 +51,7 @@ async function login(localOptions, cmd) {
 
     console.log(`Build Service login (${url}):`);
 
-    const token = options.buildServiceToken || await readline.question('Token: ', {});
+    const token = buildServiceConfig.token || await readline.question('Token: ', {});
 
     const response = await superagent.get(`${url}/api/v1/profile`).query({ accessToken: token }).ok(() => true);
     if (response.status === 401 || response.status === 403) return exit(`Authentication error: ${requestError(response)}`);
@@ -191,8 +205,8 @@ async function buildLocal(manifest, sourceDir, appConfig, options) {
     config.setAppBuildConfig(sourceDir, appConfig);
 }
 
-async function buildRemote(manifest, sourceDir, appConfig, options) {
-    console.log('Using build service', config.getBuildServiceConfig().url);
+async function buildRemote(manifest, sourceDir, appConfig, options, buildServiceConfig) {
+    console.log('Using build service', buildServiceConfig.url);
 
     let tag;
     if (options.tag) {
@@ -211,8 +225,6 @@ async function buildRemote(manifest, sourceDir, appConfig, options) {
     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');
@@ -282,12 +294,12 @@ async function build(localOptions, cmd) {
     const sourceDir = path.dirname(manifestFilePath);
 
     const appConfig = config.getAppBuildConfig(sourceDir);
-    const buildServiceConfig = config.getBuildServiceConfig();
+    const buildServiceConfig = getEffectiveBuildServiceConfig(options);
 
     let repository = appConfig.repository;
-    if (!repository || options.setRepository) {
-        if (typeof options.setRepository === 'string') {
-            repository = options.setRepository;
+    if (!repository || options.repository) {
+        if (typeof options.repository === 'string') {
+            repository = options.repository;
         } else {
             repository = await readline.question(`Enter docker repository (e.g registry/username/${manifest.id || path.basename(sourceDir)}): `, {});
             if (!repository) exit('No repository provided');
@@ -303,7 +315,7 @@ async function build(localOptions, cmd) {
 
     appConfig.gitCommit = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim(); // when the build gets saved, save the gitCommit also
     if (buildServiceConfig.type === 'remote' && buildServiceConfig.url) {
-        await buildRemote(manifest, sourceDir, appConfig, options);
+        await buildRemote(manifest, sourceDir, appConfig, options, buildServiceConfig);
     } else {
         await buildLocal(manifest, sourceDir, appConfig, options);
     }
@@ -312,7 +324,7 @@ async function build(localOptions, cmd) {
 async function logs(localOptions, cmd) {
     const options = cmd.optsWithGlobals();
 
-    const buildServiceConfig = config.getBuildServiceConfig();
+    const buildServiceConfig = getEffectiveBuildServiceConfig(options);
     if (buildServiceConfig.type !== 'remote') return exit('This command only works with the build service. Use cloudron build login first.');
 
     if (!options.id) return exit('buildId is required');
@@ -324,7 +336,7 @@ async function logs(localOptions, cmd) {
 async function status(localOptions, cmd) {
     const options = cmd.optsWithGlobals();
 
-    const buildServiceConfig = config.getBuildServiceConfig();
+    const buildServiceConfig = getEffectiveBuildServiceConfig(options);
     if (buildServiceConfig.type !== 'remote') return exit('This command only works with the build service. Use cloudron build login first.');
 
     if (!options.id) return exit('buildId is required');
@@ -337,7 +349,7 @@ async function status(localOptions, cmd) {
 async function push(localOptions, cmd) {
     const options = cmd.optsWithGlobals();
 
-    const buildServiceConfig = config.getBuildServiceConfig();
+    const buildServiceConfig = getEffectiveBuildServiceConfig(options);
     if (buildServiceConfig.type !== 'remote') return exit('This command only works with the build service. Use cloudron build login first.');
 
     if (!options.id) return exit('buildId is required');
@@ -377,10 +389,10 @@ async function clear(/* localOptions, cmd */) {
     config.unsetAppBuildConfig(sourceDir);
 }
 
-async function info(/* localOptions, cmd */) {
-    // const options = cmd.optsWithGlobals();
+async function info(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
 
-    const buildService = config.getBuildServiceConfig();
+    const buildService = getEffectiveBuildServiceConfig(options);
     console.log(`Build service type: ${buildService.type || 'local'}`);
     if (buildService.type === 'remote') console.log(`Build service URL: ${buildService.url}`);