From 8fbbe6396f400a9a50d4686c39969470edf2a246 Mon Sep 17 00:00:00 2001
From: Elizabeth Hunt <me@liz.coffee>
Date: Tue, 1 Jul 2025 10:12:55 -0700
Subject: Lift all utility functions in runner scripts

---
 worker/scripts/build_docker_image.ts | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'worker/scripts/build_docker_image.ts')

diff --git a/worker/scripts/build_docker_image.ts b/worker/scripts/build_docker_image.ts
index 5dd5b4e..1783e7c 100755
--- a/worker/scripts/build_docker_image.ts
+++ b/worker/scripts/build_docker_image.ts
@@ -7,6 +7,7 @@ import {
     LogMetricTraceable,
     Metric,
     TraceUtil,
+    Command,
 } from '@emprespresso/pengueno';
 import type { BuildDockerImageJob, BuildDockerImageJobProps } from '@emprespresso/ci_model';
 import { Bitwarden, type LoginItem } from '@emprespresso/ci_worker';
@@ -26,7 +27,7 @@ const eitherJob = getRequiredEnvVars([
             arguments: baseArgs,
         },
 );
-console.log(eitherJob);
+
 const eitherVault = Bitwarden.getConfigFromEnvironment().mapRight((config) => new Bitwarden(config));
 
 const buildImageMetric = Metric.fromName('dockerImage.build').asResult();
@@ -105,19 +106,14 @@ await LogMetricTraceable.ofLogTraceable(_logJob)
     })
     .get();
 
-const getDockerLoginCommand = (username: string, registry: string) =>
-    `docker login --username ${username} --password $REGISTRY_PASSWORD ${registry}`.split(' ');
+function getDockerLoginCommand(username: string, registry: string): Command {
+    return `docker login --username ${username} --password $REGISTRY_PASSWORD ${registry}`.split(' ');
+}
 
-const getBuildCommand = ({ buildTarget, imageTag, dockerfile, context }: BuildDockerImageJobProps) => [
-    'docker',
-    'build',
-    '--target',
-    buildTarget,
-    '-t',
-    imageTag,
-    '-f',
-    dockerfile,
-    context,
-];
+function getBuildCommand({ buildTarget, imageTag, dockerfile, context }: BuildDockerImageJobProps): Command {
+    return ['docker', 'build', '--target', buildTarget, '-t', imageTag, '-f', dockerfile, context];
+}
 
-const getPushCommand = (tag: string) => ['docker', 'push', tag];
+function getPushCommand(tag: string): Command {
+    return ['docker', 'push', tag];
+}
-- 
cgit v1.2.3-70-g09d2