cloudron 7.0.4 → 7.0.6

package/package.json

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

package/src/actions.js

@@ -106,10 +106,14 @@ async function stopActiveTask(app, options) {
 function saveCwdAppId(appId, manifestFilePath) {
     if (!manifestFilePath) return;
 
-    const sourceDir = path.dirname(manifestFilePath);
-    const cwdConfig = config.getCwdConfig(sourceDir);
-    cwdConfig.appId = appId;
-    config.setCwdConfig(sourceDir, cwdConfig);
+    try {
+        const sourceDir = path.dirname(manifestFilePath);
+        const cwdConfig = config.getCwdConfig(sourceDir);
+        cwdConfig.appId = appId;
+        config.setCwdConfig(sourceDir, cwdConfig);
+    } catch (e) { // will happen when run on EROFS (set HOME to avoid)
+        console.log(`Warning: Could not save app id to config: ${e.message} . Try setting $HOME`);
+    }
 }
 
 // appId may be the appId or the location
@@ -542,6 +546,7 @@ async function install(localOptions, cmd) {
 
             manifest = response.body.manifest;
             versionsUrl = response.body.versionsUrl;
+            console.log(`Using image ${manifest.dockerImage} (from versions url)`);
         } else {
             const result = await getManifest(options.appstoreId || '');
             manifest = result.manifest;
@@ -563,14 +568,19 @@ async function install(localOptions, cmd) {
                         }
                     });
 
-                    sourceArchiveFilePath = path.join(os.tmpdir(), `cloudron-source-${Date.now()}.tar`);
+                    sourceArchiveFilePath = path.join(os.tmpdir(), `cloudron-source-${Date.now()}.tar.gz`);
                     const sourceArchiveStream = fs.createWriteStream(sourceArchiveFilePath);
 
-                    const [tarError] = await safe(stream.pipeline(tarStream, sourceArchiveStream));
+                    const [tarError] = await safe(stream.pipeline(tarStream, zlib.createGzip(), sourceArchiveStream));
                     if (tarError) return exit(`Could not create source archive: ${tarError.message}`);
                 } else {
                     manifest.dockerImage = image;
+                    const buildServiceConfig = config.getBuildServiceConfig();
+                    const buildInfo = buildServiceConfig.type === 'remote' ? `remote - ${buildServiceConfig.url}` : 'local';
+                    console.log(`Using image ${image} (built ${buildInfo})`);
                 }
+            } else {
+                console.log(`Using image ${manifest.dockerImage} (from app store)`);
             }
         }
 
@@ -840,7 +850,7 @@ async function update(localOptions, cmd) {
             const image = options.image || config.getCwdConfig(sourceDir).dockerImage;
 
             if (!image) {
-                console.log('No docker image detected. Creating source archive from this folder.');
+                console.log('No build detected. This package will be built on the server.');
 
                 const dockerignoreFilePath = path.join(sourceDir, '.dockerignore');
                 const ignoreMatcher = dockerignoreMatcher(dockerignoreFilePath);
@@ -851,13 +861,16 @@ async function update(localOptions, cmd) {
                     }
                 });
 
-                sourceArchiveFilePath = path.join(os.tmpdir(), `cloudron-source-${Date.now()}.tar`);
+                sourceArchiveFilePath = path.join(os.tmpdir(), `cloudron-source-${Date.now()}.tar.gz`);
                 const sourceArchiveStream = fs.createWriteStream(sourceArchiveFilePath);
 
-                const [tarError] = await safe(stream.pipeline(tarStream, sourceArchiveStream));
+                const [tarError] = await safe(stream.pipeline(tarStream, zlib.createGzip(), sourceArchiveStream));
                 if (tarError) return exit(`Could not create source archive: ${tarError.message}`);
             } else {
                 manifest.dockerImage = image;
+                const buildServiceConfig = config.getBuildServiceConfig();
+                const buildInfo = buildServiceConfig.type === 'remote' ? `remote - ${buildServiceConfig.url}` : 'local';
+                console.log(`Using image ${image} (built ${buildInfo})`);
             }
 
             if (manifest.icon) {
@@ -866,6 +879,8 @@ async function update(localOptions, cmd) {
                 data.icon = safe.fs.readFileSync(iconFilename, { encoding: 'base64' });
                 if (!data.icon) return exit(`Could not read icon: ${iconFilename} message: ${safe.error.message}`);
             }
+        } else {
+            console.log(`Using image ${manifest.dockerImage} (from app store)`);
         }
 
         data = Object.assign(data, {

package/src/build-actions.js

@@ -295,11 +295,6 @@ async function build(localOptions, cmd) {
 
     const appConfig = config.getCwdConfig(sourceDir);
     const buildServiceConfig = getEffectiveBuildServiceConfig(options);
-    if (buildServiceConfig.type === 'remote' && buildServiceConfig.url) {
-        console.log('Building using remote build service at %s', buildServiceConfig.url);
-    } else {
-        console.log('Building locally with Docker.');
-    }
 
     let repository = appConfig.repository;
     if (!repository || options.repository) {