improve package-lock handling for the docker build process

Author: krausest

docker-rebuild.js

@@ -8,9 +8,6 @@ const rimraf = require('rimraf');
 let args = process.argv.length<=2 ? [] : process.argv.slice(2,process.argv.length);
 
 let frameworks = args.filter(a => !a.startsWith("--"));
-let justCopyAndBuild = args.some(f => f=="--justCopyAndBuild")
-
-console.log("justCopyAndBuild", justCopyAndBuild);
 
 if (frameworks.length==0) {
     console.log("ERROR: Missing arguments. Command: docker-rebuild keyed/framework1 non-keyed/framework2 ...");
@@ -31,29 +28,22 @@ for (f of frameworks) {
     }
     let [keyed,name] = components;
     let path = `frameworks/${keyed}/${name}`
-    if (justCopyAndBuild) {
-        rsync(keyed,name);
-        exec('npm run build-prod', {
-            cwd: path,
-            stdio: 'inherit'
-        });
-    } else {
-        if (fs.existsSync(path)) {
-            console.log("deleting folder ",path);
-            exec(`rm -r ${path}`);
-        }
-        rsync(keyed,name);
-        exec('rm -rf package-lock.json yarn.lock dist elm-stuff bower_components node_modules', {
-            cwd: path,
-            stdio: 'inherit'
-        });
-        console.log("running npm install && npm run build-prod");
-        exec('npm install && npm run build-prod', {
-            cwd: path,
-            stdio: 'inherit'
-        });
-
-    }
+      if (fs.existsSync(path)) {
+          console.log("deleting folder ",path);
+          exec(`rm -r ${path}`);
+      }
+      rsync(keyed,name);
+      exec('rm -rf package-lock.json yarn.lock dist elm-stuff bower_components node_modules output', {
+          cwd: path,
+          stdio: 'inherit'
+      });
+      console.log("running npm install && npm run build-prod");
+      exec('npm install && npm run build-prod', {
+          cwd: path,
+          stdio: 'inherit'
+      });
+      let packageLockPath = path+"/package-lock.json";
+      fs.copyFileSync(packageLockPath, "/src/"+packageLockPath)
 }
 
 let frameworkNames = frameworks.join(" ");

package.json

@@ -18,8 +18,9 @@
     "docker-build-image": "docker build -t js-framework-benchmark-ubuntu -f Dockerfile .",
     "docker-start": "cross-env-shell docker run --rm -d -p 8080:8080 --name js-framework-benchmark --volume ${INIT_CWD}:/src --volume js-framework-benchmark:/build js-framework-benchmark-ubuntu",
     "docker-stop": "docker stop js-framework-benchmark",
-    "docker-sync": "docker exec -it js-framework-benchmark rsync -avC --exclude /index.html --exclude /framework/**/dist --exclude /webdriver-ts*/dist --exclude package-lock.json --exclude node_modules --exclude /webdriver-ts/results*/ /src/ /build/",
-    "docker-build-frameworks": "npm run docker-sync && docker exec -it js-framework-benchmark npm install && docker exec -it js-framework-benchmark node build.js",
+    "docker-sync": "docker exec -it js-framework-benchmark rsync -avC --exclude /index.html --exclude /framework/**/dist --exclude /webdriver-ts*/dist --exclude node_modules --exclude /webdriver-ts/results*/ /src/ /build/",
+    "docker-sync-package-lock-back": "docker exec -it js-framework-benchmark bash sync-package-lock.sh",    
+    "docker-build-frameworks": "npm run docker-sync && docker exec -it js-framework-benchmark npm install && docker exec -it js-framework-benchmark node docker-rebuil-all.js",
     "docker-install-webdriver": "npm run docker-sync && docker exec -it js-framework-benchmark npm run install-local",
     "docker-create-index": "docker exec -it -w /build/webdriver-ts js-framework-benchmark npm run index",
     "docker-rebuild": "docker exec -it js-framework-benchmark cp /src/docker-rebuild.js /build/ && docker exec -it js-framework-benchmark node docker-rebuild.js",