fix #1367

Author: krausest

Dockerfile

@@ -268,7 +268,7 @@ cd ..
 npm run build-prod
 ```
 
-After downloading the whole internet it starts building it. Basically there should be no errors during the build, but I can't guarantee that the dependencies won't break. (There's a docker build on the way which might make building it more robust. See https://github.com/krausest/js-framework-benchmark/wiki/%5BUnder-construction%5D-Build-all-frameworks-with-docker)
+After downloading the whole internet it starts building it. Basically there should be no errors during the build, but I can't guarantee that the dependencies won't break. 
 
 You can now run the benchmark for all frameworks by invoking:
 

README.md

@@ -19,19 +19,9 @@
     "install-server": "cd server && npm ci",
     "install-webdriver-ts-results": "cd webdriver-ts-results && npm ci",
     "install-local": "npm run install-webdriver-ts && npm run install-webdriver-ts-results && npm run install-server",
-    "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 --ipc=host -v /dev/shm:/dev/shm --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 /webdriver-ts*/traces --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 rebuild-all.js --ci --docker --",
-    "docker-build-frameworks-non-ci": "npm run docker-sync && docker exec -it js-framework-benchmark npm install && docker exec -it js-framework-benchmark node rebuild-all.js --docker --",
     "rebuild": "node rebuild-single.js --",
     "rebuild-ci": "node rebuild-single.js -- --ci",
-    "docker-rebuild": "node rebuild-single.js -- --docker",
-    "docker-rebuild-ci": "node rebuild-single.js -- --ci --docker",
-    "docker-shell": "docker exec -it js-framework-benchmark /bin/bash",
-    "zip": "npm run docker-sync && docker exec -it js-framework-benchmark node cli zip && docker cp js-framework-benchmark:/build/build.zip .",
+    "zip": "node cli.js zip",
     "format": "prettier . \"!(broken-frameworks|frameworks)/**/*\" -w",
     "lint": "eslint . --ignore-pattern \"/broken-frameworks/\" --ignore-pattern \"/frameworks/\""
   },

package.json

@@ -6,17 +6,12 @@ import { takeWhile } from "./utils/common/index.js";
 import { getFrameworks } from "./utils/frameworks/index.js";
 
 const args = yargs(process.argv.slice(2))
-  .usage("$0 [--ci --docker keyed/framework1 ... non-keyed/frameworkN]")
+  .usage("$0 [--ci keyed/framework1 ... non-keyed/frameworkN]")
   .help()
   .boolean("ci")
   .default("ci", false)
   .describe("ci", "Use npm ci or npm install?")
-  .boolean("docker")
-  .default("docker", false)
-  .describe(
-    "docker",
-    "Copy package-lock back for docker build or build locally?",
-  ).argv;
+  .argv;
 
 /*
 This script rebuilds all frameworks from scratch,
@@ -33,12 +28,6 @@ npm run rebuild-frameworks --restartWith keyed/react
  */
 const useCi = args.ci;
 
-/**
- * Copy package-lock back for docker build or build locally?
- * @type {boolean}
- */
-const useDocker = args.docker;
-
 const restartBuildingWith = args._.find((arg) => !arg.startsWith("--"));
 const restartWithFramework = restartBuildingWith || "";
 
@@ -47,8 +36,6 @@ console.log(
   args,
   "ci",
   useCi,
-  "docker",
-  useDocker,
   "restartWith",
   restartWithFramework,
 );
@@ -134,12 +121,6 @@ function buildFramework(framework) {
 
   const buildCmd = "npm run build-prod";
   runCommand(buildCmd, frameworkPath);
-
-  if (useDocker) {
-    const packageLockPath = path.join(frameworkPath, "package-lock.json");
-    const destinationPath = path.join("/src", packageLockPath);
-    fs.copyFileSync(packageLockPath, destinationPath);
-  }
 }
 
 function buildFrameworks() {

rebuild-all.js

@@ -4,29 +4,18 @@ import path from "node:path";
 import yargs from "yargs";
 
 const args = yargs(process.argv.slice(2))
-  .usage("$0 [--ci --docker keyed/framework1 ... non-keyed/frameworkN]")
+  .usage("$0 [--ci keyed/framework1 ... non-keyed/frameworkN]")
   .boolean("ci")
   .default("ci", false)
   .describe("ci", "Use npm ci or npm install ?")
-  .boolean("docker")
-  .default("docker", false)
-  .describe(
-    "docker",
-    "Copy package-lock back for docker build or build locally?"
-  ).argv;
+  .argv;
 
 /**
  * Use npm ci or npm install?
  * @type {boolean}
  */
 const useCi = args.ci;
 
-/**
- * Copy package-lock back for docker build or build locally?
- * @type {boolean}
- */
-const useDocker = args.docker;
-
 /**
  * @type {string}
  */
@@ -37,8 +26,6 @@ console.log(
   args,
   "useCi",
   useCi,
-  "useDocker",
-  useDocker,
   "frameworks",
   frameworks
 );
@@ -54,7 +41,7 @@ const filesToDelete = [
 ].filter(Boolean);
 
 /*
-rebuild-single.js [--ci] [--docker] [keyed/framework1 ... non-keyed/frameworkN]
+rebuild-single.js [--ci] [keyed/framework1 ... non-keyed/frameworkN]
 
 This script rebuilds a single framework
 By default it rebuilds from scratch, deletes all package.json and package-lock.json files
@@ -110,18 +97,6 @@ function rebuildFramework(framework) {
   const [keyed, name] = components;
   const frameworkPath = path.join("frameworks", keyed, name);
 
-  if (useDocker) {
-    if (fs.existsSync(frameworkPath)) {
-      console.log("deleting folder ", frameworkPath);
-      fs.rmSync(frameworkPath, { recursive: true });
-    }
-
-    const rsyncCmd = `rsync -avC --exclude elm-stuff --exclude dist --exclude output ${
-      useCi ? "" : "--exclude package-lock.json"
-    } --exclude tmp --exclude node_modules --exclude bower_components /src/frameworks/${keyed}/${name} /build/frameworks/${keyed}/`;
-    runCommand(rsyncCmd);
-  }
-
   deleteFrameworkFiles(frameworkPath, filesToDelete);
 
   const installCmd = `npm ${useCi ? "ci" : "install"}`;
@@ -130,17 +105,12 @@ function rebuildFramework(framework) {
   const buildCmd = "npm run build-prod";
   runCommand(buildCmd, frameworkPath);
 
-  if (useDocker) {
-    const packageJSONPath = path.join(frameworkPath, "package-lock.json");
-    const destinationPath = path.join("/src", packageJSONPath);
-    fs.copyFileSync(packageJSONPath, destinationPath);
-  }
 }
 
 function rebuildFrameworks() {
   if (!frameworks.length) {
     console.log(
-      "ERROR: Missing arguments. Command: docker-rebuild keyed/framework1 non-keyed/framework2 ..."
+      "ERROR: Missing arguments. Command: rebuild keyed/framework1 non-keyed/framework2 ..."
     );
     process.exit(1);
   }

rebuild-build-single.js

@@ -2,29 +2,18 @@ import { execSync } from "node:child_process";
 import yargs from "yargs";
 
 const args = yargs(process.argv.slice(2))
-  .usage("$0 [--ci --docker keyed/framework1 ... non-keyed/frameworkN]")
+  .usage("$0 [--ci  keyed/framework1 ... non-keyed/frameworkN]")
   .boolean("ci")
   .default("ci", false)
   .describe("ci", "Use npm ci or npm install ?")
-  .boolean("docker")
-  .default("docker", false)
-  .describe(
-    "docker",
-    "Copy package-lock back for docker build or build locally?"
-  ).argv;
+  .argv;
 
 /**
  * Use npm ci or npm install ?
  * @type {boolean}
  */
 const useCi = args.ci;
 
-/**
- * Copy package-lock back for docker build or build locally?
- * @type {boolean}
- */
-const useDocker = args.docker;
-
 /**
  * @type {string}
  */
@@ -40,14 +29,12 @@ console.log(
   args,
   "ci",
   useCi,
-  "docker",
-  useDocker,
   "frameworks",
   frameworks
 );
 
 /*
-rebuild-single.js [--ci] [--docker] [keyed/framework1 ... non-keyed/frameworkN]
+rebuild-single.js [--ci] [keyed/framework1 ... non-keyed/frameworkN]
 
 This script rebuilds a single framework
 By default it rebuilds from scratch, deletes all package.json and package-lock.json files
@@ -72,14 +59,12 @@ function runCommand(command, cwd = undefined) {
 try {
   if (frameworks.length == 0) {
     console.log(
-      "ERROR: Missing arguments. Command: docker-rebuild keyed/framework1 non-keyed/framework2 ..."
+      "ERROR: Missing arguments. Command: rebuild-single keyed/framework1 non-keyed/framework2 ..."
     );
     process.exit(1);
   }
 
-  const buildCmd = useDocker
-    ? `docker exec -it js-framework-benchmark cp /src/rebuild-build-single.js /build/ && docker exec -it js-framework-benchmark node rebuild-build-single.js ${frameworksNames}`
-    : `node rebuild-build-single.js ${frameworksNames}`;
+  const buildCmd = `node rebuild-build-single.js ${frameworksNames}`;
   runCommand(buildCmd);
 
   const checkCmd = `node rebuild-check-single.js ${frameworksNames}`;