From 6735b777ab39091249c4f81f766261420697dc0e Mon Sep 17 00:00:00 2001
From: Peter Hedenskog <peter@soulgalore.com>
Date: Sat, 25 May 2024 14:39:01 +0200
Subject: [PATCH] A better docketr file structure (#6)

---
 .../src/testrunners/docker-testrunner.js      | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/testrunner/src/testrunners/docker-testrunner.js b/testrunner/src/testrunners/docker-testrunner.js
index 1ee1991..a92305f 100644
--- a/testrunner/src/testrunners/docker-testrunner.js
+++ b/testrunner/src/testrunners/docker-testrunner.js
@@ -1,6 +1,6 @@
 import { writeFile, readFile, mkdir, rm } from 'node:fs/promises';
 import path from 'node:path';
-// import os from 'node:os';
+import os from 'node:os';
 
 import { execa } from 'execa';
 import log from 'intel';
@@ -18,11 +18,15 @@ export default async function runJob(job) {
   let workingDirectory;
   try {
     logger.info('Start with job');
-    const baseWorkingDirectory = './'; // nconf.get('workingDirectory') || os.tmpdir();
+    const baseWorkingDirectory = os.tmpdir();
     const dockerContainer = nconf.get('docker:container');
 
     workingDirectory = join(baseWorkingDirectory, job.queue.name, job.id);
-
+    const insideDockerDirectory = join(
+      '/sitespeed.io/',
+      job.queue.name,
+      job.id
+    );
     await mkdir(workingDirectory, { recursive: true });
     const configFileName = `${job.queue.name}-${job.id}-config.json`;
     const resultFileName = `${job.queue.name}-${job.id}-result.json`;
@@ -41,7 +45,8 @@ export default async function runJob(job) {
     const parameters = setupDockerParameters(
       job,
       dockerContainer,
-      workingDirectory,
+      baseWorkingDirectory,
+      insideDockerDirectory,
       configFileName,
       resultFileName
     );
@@ -131,7 +136,8 @@ async function handleScriptingFile(job, workingDirectory) {
 function setupDockerParameters(
   job,
   dockerContainer,
-  workingDirectory,
+  baseWorkingDirectory,
+  insideDockerDirectory,
   configFileName,
   resultFileName
 ) {
@@ -139,12 +145,12 @@ function setupDockerParameters(
     'run',
     '--rm',
     '--volume',
-    `${process.cwd()}:/sitespeed.io`,
+    `${baseWorkingDirectory}:/sitespeed.io`,
     dockerContainer,
     '--config',
-    join(workingDirectory, configFileName),
+    join(insideDockerDirectory, configFileName),
     '--storeResult',
-    join(workingDirectory, resultFileName)
+    join(insideDockerDirectory, resultFileName)
   ];
 
   if (job.data.config.webpagereplay) {