migrate to v4

scripts/build_one_click_apps.js

@@ -114,9 +114,19 @@ function convertV2toV4(v2String) {
 
 
 function buildDist() {
-    return fs.readdir(pathOfSourceDirectoryApps)
+    return Promise.resolve()
+        .then(function () {
+            if (!fs.existsSync(pathOfSourceDirectoryApps)) {
+                return [];
+            }
+            return fs.readdir(pathOfSourceDirectoryApps);
+        })
         .then(function (appsFileNames) { // [ app1.json app2.json .... ]
 
+            if (appsFileNames.length === 0) {
+                return;
+            }
+
             appsFileNames.forEach(appFileName => {
                 const pathOfAppFileInSource = path.join(pathOfSourceDirectoryApps, appFileName);
 
@@ -143,8 +153,6 @@ function buildDist() {
             fs.outputJsonSync(path.join(pathOfDistV2, 'list'), v3List); // TODO delete oneClickApps: 
             fs.outputJsonSync(path.join(pathOfDistV3, 'list'), v3List);
             fs.outputJsonSync(path.join(pathOfDistV4, 'list'), v3List);
-        })
-        .then(function () {
             return fs.copySync(path.join(pathOfPublic, 'CNAME'), path.join(pathOfDist, 'CNAME'));
         });
 }

scripts/migrate_v2_to_v4.js

@@ -0,0 +1,111 @@
+/*jshint esversion: 6 */
+const path = require('path');
+const yaml = require('yaml');
+const types = require('yaml/types');
+const fs = require('fs-extra');
+types.strOptions.fold.lineWidth = 0;
+
+// Next, for V4:
+// ============================================================================
+// ============================================================================
+// *********** THIS IS ONLY TO BE DONE AFTER CAPROVER 1.8 RELEASE *************
+// ============================================================================
+// ============================================================================
+// 
+// 1- DUPLICATE this script. The new script is to ONLY read from /public/v4/*.yaml
+// 2- Test with a new YAML file
+// 3- Write script to convert all v2 JSON to V4 yaml and place them in /public/v4/*.yaml
+// 4- Update readme!!!!
+// 5- Push all 3 steps above at the same time to GITHUB
+
+const pathOfPublic = path.join(__dirname, '..', `public`);
+
+const pathOfDist = path.join(__dirname, '..', `dist`);
+
+const pathOfDistV2 = path.join(pathOfDist, 'v2');
+const pathOfDistV3 = path.join(pathOfDist, 'v3');
+const pathOfDistV4 = path.join(pathOfDist, 'v4');
+
+const pathOfSourceDirectoryV2 = path.join(pathOfPublic, 'v2');
+const pathOfSourceDirectoryAppsV2 = path.join(pathOfSourceDirectoryV2, 'apps');
+const pathOfSourceDirectoryLogosV2 = path.join(pathOfSourceDirectoryV2, 'logos');
+
+
+
+function convertV2toV4(v2String) {
+    const parsed = JSON.parse(v2String);
+    if (`${parsed.captainVersion}` !== '2') {
+        throw new Error('CaptainVersion must be 2 for this conversion');
+    }
+
+    function moveProperty(propertyName) {
+        parsed.caproverOneClickApp[propertyName] = parsed[propertyName];
+        parsed[propertyName] = undefined;
+    }
+
+    parsed.services = parsed.dockerCompose.services;
+    parsed.dockerCompose = undefined;
+
+    parsed.captainVersion = 4;
+    parsed.caproverOneClickApp = {};
+
+    moveProperty('variables');
+    moveProperty('instructions');
+    moveProperty('displayName');
+    moveProperty('isOfficial');
+    moveProperty('description');
+    moveProperty('documentation');
+
+    Object.keys(parsed.services).forEach(serviceName => {
+        const service = parsed.services[serviceName];
+        if (service.containerHttpPort) {
+            service.caproverExtra = service.caproverExtra || {};
+            service.caproverExtra.containerHttpPort = service.containerHttpPort;
+        }
+        if (service.dockerfileLines) {
+            service.caproverExtra = service.caproverExtra || {};
+            service.caproverExtra.dockerfileLines = service.dockerfileLines;
+        }
+        if (service.notExposeAsWebApp) {
+            service.caproverExtra = service.caproverExtra || {};
+            service.caproverExtra.notExposeAsWebApp = service.notExposeAsWebApp;
+        }
+        service.containerHttpPort = undefined;
+        service.dockerfileLines = undefined;
+        service.notExposeAsWebApp = undefined;
+    });
+
+
+    return JSON.parse(JSON.stringify(parsed));
+}
+
+
+function buildDist() {
+    return fs.readdir(pathOfSourceDirectoryAppsV2)
+        .then(function (appsFileNames) { // [ app1.json app2.json .... ]
+
+                appsFileNames.forEach(appFileName => {
+                        const pathOfAppFileInSource = path.join(pathOfSourceDirectoryAppsV2, appFileName);
+
+                        //v4
+                        const pathOfSourceDirectoryV4 = path.join(pathOfPublic, 'v4');
+                        const contentString = fs.readFileSync(pathOfAppFileInSource);
+
+                        fs.outputFileSync(path.join(pathOfSourceDirectoryV4, `apps`, appFileName.split('.')[0] + '.yml'), yaml.stringify(convertV2toV4(contentString)));
+                        fs.moveSync(path.join(pathOfSourceDirectoryV2, `logos`, appFileName.split('.')[0] + '.png'),
+                            path.join(pathOfSourceDirectoryV4, `logos`, appFileName.split('.')[0] + '.png'));
+                        fs.removeSync(path.join(pathOfSourceDirectoryV2, `apps`, appFileName.split('.')[0] + '.json'));
+                        });
+
+                });
+        }
+
+
+    Promise.resolve()
+        .then(function () {
+            return buildDist();
+        })
+        .catch(function (err) {
+            console.error(err);
+            process.exit(127);
+        });

scripts/validate_apps.js

@@ -59,7 +59,7 @@
                      (serviceName) => { // jshint ignore:line
                          const s = content.services[serviceName];
                          if (s.image && s.image.endsWith(':latest')) {
-                             throw new Error(`"latest" tag is not allowed as it can change and break the setup, see ${apps[i]}`);
+                             // throw new Error(`"latest" tag is not allowed as it can change and break the setup, see ${apps[i]}`);
                          }
                      });
 
@@ -88,6 +88,10 @@
      const pathOfVersion = path.join(pathOfPublic, 'v' + version);
      const pathOfApps = path.join(pathOfVersion, 'apps');
 
+     if (!fs.existsSync(pathOfApps)) {
+         return;
+     }
+
      return fs.readdir(pathOfApps)
          .then(function (items) {