Fix action runner initial setup

mieweb · Oct 24, 2023 · 8c87647 · 8c87647
1 parent 9093878
commit 8c87647
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/apps/wgd-action-runner/Dockerfile b/apps/wgd-action-runner/Dockerfile
@@ -19,6 +19,7 @@ RUN npm i -g postcss postcss-cli hugo-extended
 RUN git clone https://github.com/budparr/gohugo-theme-ananke.git /themes/ananke
 
 RUN git init /site
+RUN git config --global --add safe.directory /site
 
 ADD steps/ /steps
 RUN chmod a+x /steps/step_*
diff --git a/src/containers/action/ActionRunnerContainer.ts b/src/containers/action/ActionRunnerContainer.ts
@@ -162,6 +162,7 @@ export class ActionRunnerContainer extends Container {
         }, step.env, additionalEnv) : Object.assign({}, step.env, additionalEnv);
 
         this.logger.info(`DockerAPI:\ndocker run \\
+        --user=${process.getuid()} \\
         -v "${process.env.VOLUME_DATA}/${driveId}_transform:/repo" \\
         -v "${process.env.VOLUME_DATA}${contentDir}:/site/content" \\
         -v "${process.env.VOLUME_PREVIEW}/${driveId}/${themeId}:/site/public" \\
@@ -181,7 +182,8 @@ export class ActionRunnerContainer extends Container {
               `${process.env.VOLUME_DATA}/${driveId}/tmp_dir:/site/resources`
             ]
           },
-          Env: Object.keys(env).map(key => `${key}=${env[key]}`)
+          Env: Object.keys(env).map(key => `${key}=${env[key]}`),
+          User: String(process.getuid())
         });
       } else {
         const env = ['render_hugo', 'exec', 'commit_branch'].includes(step.uses) ? Object.assign({
@@ -194,6 +196,7 @@ export class ActionRunnerContainer extends Container {
         }, step.env, additionalEnv) : Object.assign({}, step.env, additionalEnv);
 
         this.logger.info(`DockerAPI:\ndocker run \\
+          --user=${process.getuid()} \\
           -v "${process.env.VOLUME_DATA}/${driveId}_transform:/repo" \\
           -v "${process.env.VOLUME_DATA}/${driveIdTransform}:/site" \\
           -v "${process.env.VOLUME_DATA}${contentDir}:/site/content" \\
@@ -215,7 +218,8 @@ export class ActionRunnerContainer extends Container {
               `${process.env.VOLUME_DATA}/${driveId}/tmp_dir:/site/resources`
             ]
           },
-          Env: Object.keys(env).map(key => `${key}=${env[key]}`)
+          Env: Object.keys(env).map(key => `${key}=${env[key]}`),
+          User: String(process.getuid())
         });
       }
 
@@ -226,6 +230,7 @@ export class ActionRunnerContainer extends Container {
         this.logger.info(writable.getBuffer().toString());
       }
     } catch (err) {
+      code = err.statusCode || 1;
       this.logger.error(err.stack ? err.stack : err.message);
     }
     return code;

diff --git a/src/utils/logger/JobLogFile.ts b/src/utils/logger/JobLogFile.ts
@@ -1,10 +1,9 @@
-import Transport, {TransportStreamOptions} from 'winston-transport';
 import path from 'path';
 import fs, {ReadStream} from 'fs';
 import os from 'os';
-import {JobLogFileProcessor} from './JobLogFileProcessor';
 import {StreamOptions} from 'stream';
-
+import Transport, {TransportStreamOptions} from 'winston-transport';
+import {JobLogFileProcessor} from './JobLogFileProcessor';
 
 interface JobLogStreamOptions extends TransportStreamOptions {
   file_options?: StreamOptions<ReadStream>;
@@ -75,6 +74,8 @@ export class JobLogFile extends Transport {
       .replace('%jobId%', jobId)
       .replace('//', '/');
 
+    fs.mkdirSync(dirname, { recursive: true });
+
     const filename = path.join(dirname, this.filename)
       .replace(/%JOB_ID%/g, jobId);
     return fs.createWriteStream(filename, this.options.file_options);
@@ -99,6 +100,8 @@ export class JobLogFile extends Transport {
       .replace('%jobId%', options.jobId)
       .replace('//', '/');
 
+    fs.mkdirSync(dirname, { recursive: true });
+
     const filename = path.join(dirname, this.filename)
       .replace(/%JOB_ID%/g, options.jobId);