cloudron 7.0.1 → 7.0.2

package/bin/cloudron

@@ -19,7 +19,7 @@ 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('--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');
 

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.1",
+  "version": "7.0.2",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "type": "module",

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}`);