diff options
Diffstat (limited to 'worker')
| -rw-r--r-- | worker/Dockerfile | 5 | ||||
| -rwxr-xr-x | worker/scripts/ansible_playbook.ts | 2 | ||||
| -rwxr-xr-x | worker/scripts/build_docker_image.ts | 3 | ||||
| -rwxr-xr-x | worker/scripts/checkout_ci.ts | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/worker/Dockerfile b/worker/Dockerfile index e2d4ac0..a8a7eb3 100644 --- a/worker/Dockerfile +++ b/worker/Dockerfile @@ -15,8 +15,11 @@ RUN tar -xvzf /docker.tgz # -- <ci_worker> -- FROM oci.liz.coffee/emprespresso/ci_base:release AS worker +RUN echo "export PATH=/app/worker/dist/scripts:$PATH" > /etc/environment +RUN chmod +x /app/worker/dist/scripts/*.js + RUN mkdir -p /var/lib/laminar/cfg -RUN cp -r /app/worker/* /var/lib/laminar/cfg +RUN cp -r /app/worker/jobs /var/lib/laminar/cfg RUN chown -R 1000:1000 /var/lib/laminar RUN groupadd docker diff --git a/worker/scripts/ansible_playbook.ts b/worker/scripts/ansible_playbook.ts index 4a22984..fb4b801 100755 --- a/worker/scripts/ansible_playbook.ts +++ b/worker/scripts/ansible_playbook.ts @@ -20,7 +20,7 @@ import { tmpdir } from 'os'; const eitherJob = getRequiredEnvVars(['path', 'playbooks']).mapRight( (baseArgs) => <AnsiblePlaybookJob>{ - type: 'ansible_playbook.ts', + type: 'ansible_playbook.js', arguments: baseArgs, }, ); diff --git a/worker/scripts/build_docker_image.ts b/worker/scripts/build_docker_image.ts index b35031a..5dd5b4e 100755 --- a/worker/scripts/build_docker_image.ts +++ b/worker/scripts/build_docker_image.ts @@ -22,10 +22,11 @@ const eitherJob = getRequiredEnvVars([ ]).mapRight( (baseArgs) => <BuildDockerImageJob>{ - type: 'build_docker_image.ts', + type: 'build_docker_image.js', arguments: baseArgs, }, ); +console.log(eitherJob); const eitherVault = Bitwarden.getConfigFromEnvironment().mapRight((config) => new Bitwarden(config)); const buildImageMetric = Metric.fromName('dockerImage.build').asResult(); diff --git a/worker/scripts/checkout_ci.ts b/worker/scripts/checkout_ci.ts index fb71a16..337aae1 100755 --- a/worker/scripts/checkout_ci.ts +++ b/worker/scripts/checkout_ci.ts @@ -22,7 +22,7 @@ const run = Date.now().toString(); const eitherJob = getRequiredEnvVars(['remote', 'refname', 'rev']).mapRight( (baseArgs) => <CheckoutCiJob>{ - type: 'checkout_ci.ts', + type: 'checkout_ci.js', arguments: { ...baseArgs, run, @@ -42,7 +42,7 @@ await LogMetricTraceable.ofLogTraceable(_logJob) tEitherJob.get().flatMapAsync((ciJob) => { const wd = getWorkingDirectoryForCiJob(ciJob); const fetchPackageJob = <FetchCodeJob>{ - type: 'fetch_code.ts', + type: 'fetch_code.js', arguments: { remoteUrl: ciJob.arguments.remote, checkout: ciJob.arguments.rev, |