fix Docker image

Author: krausest

Diff for: Dockerfile

@@ -14,7 +14,7 @@ RUN apt-get install -y python3 m4 libtinfo5 libghc-zlib-dev rsync ghc haskell-st
 
 ENV NVM_DIR /usr/local/nvm
 RUN mkdir -p $NVM_DIR
-ENV NODE_VERSION 16.13.2
+ENV NODE_VERSION 16.15.1
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.0/install.sh | bash
 
 # install node and npm
@@ -31,10 +31,6 @@ RUN mkdir /server
 RUN mkdir /build
 RUN mkdir /src
 
-COPY package.json /server
-WORKDIR /server
-RUN npm install
-
 # Volume before chown changes owwner
 VOLUME /src
 VOLUME /build
@@ -45,10 +41,20 @@ WORKDIR /build
 RUN dos2unix /root/install_rust.sh
 RUN bash /root/install_rust.sh
 
+# Create server
+
+COPY server /server
+WORKDIR /server
+RUN npm install
+
 # USER user
 
 RUN npm install
-COPY lws.config.js /server
 EXPOSE 8080
-CMD ["/server/node_modules/.bin/ws","-c","/server/lws.config.js","--static.maxage", "1"]
+WORKDIR /build
+CMD ["mkdir", "/build/frameworks"]
+CMD ["mkdir", "/build/frameworks/keyed"]
+CMD ["mkdir", "/build/frameworks/non-keyed"]
+CMD ["/server/runserver-docker.sh"]
+#CMD ["node","index.js"]
 

Diff for: server/index.js

@@ -6,6 +6,13 @@ const fsp = require('fs/promises');
 const app = express()
 const port = 8080
 
+let frameworkDirectory  = path.join(__dirname, "..", "frameworks");
+
+if (process.argv.length===3) {
+  console.log("Changing working directory to "+process.argv[2]);
+  frameworkDirectory = process.argv[2];
+}
+
 async function loadFrameworkInfo(keyedDir, directoryName) {
     let result = {
         type: keyedDir,
@@ -22,7 +29,7 @@ async function loadFrameworkInfo(keyedDir, directoryName) {
         result.buttonsInShadowRoot = useShadowRoot ? (packageJSON["js-framework-benchmark"]["buttonsInShadowRoot"] ?? true) : undefined;
     }
 
-    const frameworkPath = path.resolve("..", "frameworks", keyedDir, directoryName);
+    const frameworkPath = path.resolve(frameworkDirectory, keyedDir, directoryName);
     const packageJSONPath = path.resolve(frameworkPath, "package.json");  
     const packageLockJSONPath = path.resolve(frameworkPath, "package-lock.json");  
     if (fs.existsSync(packageJSONPath)) {
@@ -62,7 +69,7 @@ async function loadFrameworkVersionInformation(filterForFramework) {
     // frameworkArgument.length == 0 || frameworkArgument.some((arg: string) => arg == directoryName);
 
     let resultsProm = [];
-    let frameworksPath = path.resolve("..", "frameworks");
+    let frameworksPath = path.resolve(frameworkDirectory);
     for (keyedType of ["keyed", "non-keyed"]) {
       let directories = fs.readdirSync(path.resolve(frameworksPath, keyedType));
       for (let directory of directories) {
@@ -76,8 +83,8 @@ async function loadFrameworkVersionInformation(filterForFramework) {
     return Promise.all(resultsProm);
   }
 
-app.use('/frameworks', express.static(path.join(__dirname, '..', 'frameworks')))
-app.use('/css', express.static(path.join(__dirname, '..', 'css')))
+app.use('/frameworks', express.static(frameworkDirectory))
+app.use('/css', express.static(path.join(frameworkDirectory, '..', 'css')))
 
 app.get('/ls', async (req, res) => {
     let t0 = Date.now();

Diff for: server/runserver-docker.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+echo "Starting server"
+source /usr/local/nvm/nvm.sh
+cd /server
+node index.js /build/frameworks