Mount volumes into the file browser

2020-10-30 10:16:52 -07:00
parent f50a8482c3
commit 9615dc1458
4 changed files with 63 additions and 46 deletions
@@ -1,8 +1,8 @@
 'use strict';

 exports = module.exports = {
-    startSftp: startSftp,
-    rebuild: rebuild
+    startSftp,
+    rebuild
 };

 var apps = require('./apps.js'),
@@ -13,6 +13,7 @@ var apps = require('./apps.js'),
    infra = require('./infra_version.js'),
    safe = require('safetydance'),
    shell = require('./shell.js'),
+    volumes = require('./volumes.js'),
    _ = require('underscore');

 function startSftp(existingInfra, callback) {
@@ -64,49 +65,62 @@ function rebuild(callback) {
        });


-        shell.exec('inspectSftp', 'docker inspect --format="{{json .Mounts }}" sftp', function (error, result) {
-            if (!error && result) {
-                let currentDataDirs = safe.JSON.parse(result);
-                if (currentDataDirs) {
-                    currentDataDirs = currentDataDirs.filter(function (d) { return d.Destination.indexOf('/app/data/') === 0; }).map(function (d) { return { hostDir: d.Source, mountDir: d.Destination }; });
+        volumes.list(function (error, allVolumes) {
+            if (error) return callback(error);

-                    // sort for comparison
-                    currentDataDirs.sort(function (a, b) { return a.hostDir < b.hostDir ? -1 : 1; });
-                    dataDirs.sort(function (a, b) { return a.hostDir < b.hostDir ? -1 : 1; });
+            allVolumes.forEach(function (volume) {
+                if (!safe.fs.existsSync(volume.hostPath)) {
+                    debug(`Ignoring volume host path ${volume.hostPath} since it does not exist`);
+                    return;
+                }

-                    if (_.isEqual(currentDataDirs, dataDirs)) {
-                        debug('Skipping rebuild, no changes');
-                        return done();
+                dataDirs.push({ hostDir: volume.hostPath, mountDir: `/app/data/${volume.id}` });
+            });
+
+            shell.exec('inspectSftp', 'docker inspect --format="{{json .Mounts }}" sftp', function (error, result) {
+                if (!error && result) {
+                    let currentDataDirs = safe.JSON.parse(result);
+                    if (currentDataDirs) {
+                        currentDataDirs = currentDataDirs.filter(function (d) { return d.Destination.indexOf('/app/data/') === 0; }).map(function (d) { return { hostDir: d.Source, mountDir: d.Destination }; });
+
+                        // sort for comparison
+                        currentDataDirs.sort(function (a, b) { return a.hostDir < b.hostDir ? -1 : 1; });
+                        dataDirs.sort(function (a, b) { return a.hostDir < b.hostDir ? -1 : 1; });
+
+                        if (_.isEqual(currentDataDirs, dataDirs)) {
+                            debug('Skipping rebuild, no changes');
+                            return done();
+                        }
                    }
                }
-            }

-            const appDataVolumes = dataDirs.map(function (v) { return `-v "${v.hostDir}:${v.mountDir}"`; }).join(' ');
-            const cmd = `docker run --restart=always -d --name="sftp" \
-                        --hostname sftp \
-                        --net cloudron \
-                        --net-alias sftp \
-                        --log-driver syslog \
-                        --log-opt syslog-address=udp://127.0.0.1:2514 \
-                        --log-opt syslog-format=rfc5424 \
-                        --log-opt tag=sftp \
-                        -m ${memoryLimit}m \
-                        --memory-swap ${memoryLimit * 2}m \
-                        --dns 172.18.0.1 \
-                        --dns-search=. \
-                        -p 222:22 \
-                        ${appDataVolumes} \
-                        -e CLOUDRON_SFTP_TOKEN="${cloudronToken}" \
-                        -v "/etc/ssh:/etc/ssh:ro" \
-                        --label isCloudronManaged=true \
-                        --read-only -v /tmp -v /run "${tag}"`;
+                const mounts = dataDirs.map(function (v) { return `-v "${v.hostDir}:${v.mountDir}"`; }).join(' ');
+                const cmd = `docker run --restart=always -d --name="sftp" \
+                            --hostname sftp \
+                            --net cloudron \
+                            --net-alias sftp \
+                            --log-driver syslog \
+                            --log-opt syslog-address=udp://127.0.0.1:2514 \
+                            --log-opt syslog-format=rfc5424 \
+                            --log-opt tag=sftp \
+                            -m ${memoryLimit}m \
+                            --memory-swap ${memoryLimit * 2}m \
+                            --dns 172.18.0.1 \
+                            --dns-search=. \
+                            -p 222:22 \
+                            ${mounts} \
+                            -e CLOUDRON_SFTP_TOKEN="${cloudronToken}" \
+                            -v "/etc/ssh:/etc/ssh:ro" \
+                            --label isCloudronManaged=true \
+                            --read-only -v /tmp -v /run "${tag}"`;

-            // ignore error if container not found (and fail later) so that this code works across restarts
-            async.series([
-                shell.exec.bind(null, 'stopSftp', 'docker stop sftp || true'),
-                shell.exec.bind(null, 'removeSftp', 'docker rm -f sftp || true'),
-                shell.exec.bind(null, 'startSftp', cmd)
-            ], done);
+                // ignore error if container not found (and fail later) so that this code works across restarts
+                async.series([
+                    shell.exec.bind(null, 'stopSftp', 'docker stop sftp || true'),
+                    shell.exec.bind(null, 'removeSftp', 'docker rm -f sftp || true'),
+                    shell.exec.bind(null, 'startSftp', cmd)
+                ], done);
+            });
        });
    });
 }