Build executer's Docker images only when building tracers libraries

64json · 64json · commit 41287a83ed4e · 2018-08-06T00:47:04.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.0.2]
+### Fixed
+- Build executer's Docker images only when building tracers libraries
+
 ## [2.0.1]
 ### Added
 - Dockerize the building process.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@algorithm-visualizer/tracer-generator",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Visualization Libraries for Algorithm Visualizer",
   "scripts": {
     "build": "node ./node_modules/webpack/bin/webpack --bail --progress --config webpack.config.js && chmod +x ./bin/*"
diff --git a/src/languages/Builder.js b/src/languages/Builder.js
@@ -1,21 +1,17 @@
 import path from 'path';
 import fs from 'fs-extra';
-import Promise from 'bluebird';
 import * as tracers from '/specs/tracers';
 import * as randomizers from '/specs/randomizers';
 import { execute } from '/common/util';
+import Commander from '/languages/Commander';
 
-class Builder {
+class Builder extends Commander {
   constructor({ name, commands }) {
-    this.name = name;
+    super({ name });
     this.commands = commands;
     this.build = this.build.bind(this);
   }
 
-  get cwd() {
-    return path.resolve(__dirname, this.name);
-  }
-
   spec(callback, all = false) {
     Object.values(all ? { ...tracers, ...randomizers } : tracers).forEach(tracer => {
       const { name, content } = callback(tracer);
@@ -33,23 +29,25 @@ class Builder {
   }
 
   build() {
-    const command = this.commands.join(' && ');
-    if (fs.existsSync(path.resolve(this.cwd, 'builder', 'Dockerfile'))) {
-      const imageTag = `${this.name}-builder`;
-      return execute(`docker build -t ${imageTag} ./builder`, this.cwd)
-        .then(() => execute([
-          `docker run --rm`,
-          '-w=/usr/tracers',
-          `-v=$PWD/tracers:/usr/tracers:rw`,
-          imageTag,
-          '/bin/bash -c',
-          `"${command}"`,
-        ].join(' '), this.cwd));
-    } else if (command) {
-      return execute(command, path.resolve(this.cwd, 'tracers'));
-    } else {
-      return Promise.resolve();
-    }
+    return fs.pathExists(path.resolve(this.cwd, 'builder', 'Dockerfile'))
+      .then(exists => {
+        const command = this.commands.join(' && ');
+        if (exists) {
+          return execute(`docker build -t ${this.builderImageTag} ./builder`, this.cwd)
+            .then(() => execute([
+              `docker run --rm`,
+              '-w=/usr/tracers',
+              `-v=$PWD/tracers:/usr/tracers:rw`,
+              this.builderImageTag,
+              '/bin/bash -c',
+              `"${command}"`,
+            ].join(' '), this.cwd));
+        } else if (command) {
+          return execute(command, path.resolve(this.cwd, 'tracers'));
+        }
+      })
+      .then(() => fs.pathExists(path.resolve(this.cwd, 'executer', 'Dockerfile')))
+      .then(exists => exists && execute(`docker build -t ${this.executerImageTag} ./executer`, this.cwd));
   }
 }
 
diff --git a/src/languages/Commander.js b/src/languages/Commander.js
@@ -0,0 +1,15 @@
+import path from 'path';
+
+class Commander {
+  constructor({ name }) {
+    this.name = name;
+    this.builderImageTag = `${this.name}-builder`;
+    this.executerImageTag = `${this.name}-executer`;
+  }
+
+  get cwd() {
+    return path.resolve(__dirname, this.name);
+  }
+}
+
+export default Commander;
diff --git a/src/languages/Exeuter.js b/src/languages/Exeuter.js
@@ -1,32 +1,27 @@
-import path from 'path';
 import { execute } from '/common/util';
+import Commander from '/languages/Commander';
 
-class Executer {
+class Executer extends Commander {
   constructor({ name, compileCommand, runCommand }) {
-    this.name = name;
+    super({ name });
     this.compileCommand = compileCommand;
     this.runCommand = runCommand;
     this.compile = this.compile.bind(this);
     this.run = this.run.bind(this);
   }
 
-  get cwd() {
-    return path.resolve(__dirname, this.name);
-  }
-
   execute(tempPath, command) {
-    const imageTag = `${this.name}-executer`;
-    return execute(`docker build -t ${imageTag} ./executer`, this.cwd)
     // TODO: memory limit + time limit + space limit?
-      .then(() => execute([
-        `docker run --rm`,
-        '-w=/usr/judge',
-        `-v=$PWD/tracers:/usr/bin/tracers:ro`,
-        `-v=${tempPath}:/usr/judge:rw`,
-        `-e MAX_TRACES=${1e6} -e MAX_TRACERS=${1e2}`, // Load from /common/config
-        imageTag,
-        `"${command}"`,
-      ].join(' '), this.cwd));
+    return execute([
+      `docker run --rm`,
+      '-w=/usr/judge',
+      `-v=$PWD/tracers:/usr/bin/tracers:ro`,
+      `-v=${tempPath}:/usr/judge:rw`,
+      `-e MAX_TRACES=${1e6} -e MAX_TRACERS=${1e2}`, // TODO: load from /common/config
+      this.executerImageTag,
+      '/bin/bash -c',
+      `"${command}"`,
+    ].join(' '), this.cwd);
   }
 
   compile(tempPath) {
diff --git a/src/languages/cpp/tracers/include/Randomize.h b/src/languages/cpp/tracers/include/Randomize.h
@@ -14,8 +14,7 @@ namespace Randomize {
         Randomizer() {
         }
 
-        virtual T create() {
-        }
+        virtual T create() = 0;
     };
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@algorithm-visualizer/tracer-generator",`
`3`		`- "version": "2.0.1",`
	`3`	`+ "version": "2.0.2",`
`4`	`4`	`"description": "Visualization Libraries for Algorithm Visualizer",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"build": "node ./node_modules/webpack/bin/webpack --bail --progress --config webpack.config.js && chmod +x ./bin/*"`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,7 @@ namespace Randomize {`
`14`	`14`	`Randomizer() {`
`15`	`15`	`}`
`16`	`16`
`17`		`- virtual T create() {`
`18`		`- }`
	`17`	`+ virtual T create() = 0;`
`19`	`18`	`};`
`20`	`19`
`21`	`20`