diff options
Diffstat (limited to 'worker')
| -rw-r--r-- | worker/Dockerfile | 4 | ||||
| -rwxr-xr-x | worker/scripts/checkout_ci.ts | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/worker/Dockerfile b/worker/Dockerfile index 8261c2f..db3da52 100644 --- a/worker/Dockerfile +++ b/worker/Dockerfile @@ -15,6 +15,8 @@ RUN tar -xvzf /docker.tgz # -- <ci_worker> -- FROM oci.liz.coffee/emprespresso/ci_base:release AS worker +RUN apt-get update && apt-get install -yqq git jq + RUN chmod +x /app/worker/dist/scripts/*.js ENV PIPELINE_PATH=/app/worker/dist/scripts @@ -32,8 +34,6 @@ RUN usermod -a -d /var/lib/laminar -G docker node COPY --from=worker_dependencies /bw /usr/local/bin/ COPY --from=worker_dependencies /docker/* /usr/local/bin/ -RUN apt-get update && apt-get install -yqq git jq - USER node WORKDIR /var/lib/laminar EXPOSE 8080 diff --git a/worker/scripts/checkout_ci.ts b/worker/scripts/checkout_ci.ts index dade7c4..0a8b30d 100755 --- a/worker/scripts/checkout_ci.ts +++ b/worker/scripts/checkout_ci.ts @@ -18,6 +18,15 @@ import { join } from 'path'; import { type CheckoutCiJob, type FetchCodeJob, PipelineImpl } from '@emprespresso/ci_model'; import { executeJob, executePipeline } from '@emprespresso/ci_worker'; +export interface CiWorkflow { + workflow: string; +} +export function isCiWorkflow(t: unknown): t is CiWorkflow { + return isObject(t) && 'workflow' in t && typeof t.workflow === 'string' && !t.workflow.includes('..'); +} + +const CI_WORKFLOW_FILE = '.ci/ci.json'; + const run = Date.now().toString(); const eitherJob = getRequiredEnvVars(['remote', 'refname', 'rev']).mapRight( (baseArgs) => @@ -149,12 +158,3 @@ function getPipelineGenerationCommand( '/pipeline_generator', ]; } - -export interface CiWorkflow { - workflow: string; -} -export function isCiWorkflow(t: unknown): t is CiWorkflow { - return isObject(t) && 'workflow' in t && typeof t.workflow === 'string' && !t.workflow.includes('..'); -} - -const CI_WORKFLOW_FILE = '.ci/ci.json'; |