feat(stacks.api/addons/arc): use custom arc runner image

Signed-off-by: Braden Mars <bradenmars@bradenmars.me>
CrisisCleanup · Sep 21, 2023 · d193080 · d193080
1 parent 42e689d
commit d193080
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/packages/stacks/api/src/addons/arc.ts b/packages/stacks/api/src/addons/arc.ts
@@ -363,15 +363,16 @@ export class ARCScaleSet extends blueprints.HelmAddOn {
 
 		const initCommands = [
 			'sudo chown -R runner:docker /home/runner',
-			'cp -r /runnertmp/* /home/runner/',
-			'mkdir -p /home/runner/externals',
+			'cp -r /home/runner/* /runner/',
+			'mkdir -p /runner/externals',
 			'(mv /home/runner/externalstmp/* /home/runner/externals/ || true)',
-			'(mv /runnertmp/* /home/runner/externals/ || true)',
+			'(sudo mv /runnertmp/* /home/runner/externals/ || true)',
 			'sudo chown -R runner:docker /home/runner',
+			'sudo chown -R runner:docker /runner || true',
+			'sudo chown -R runner:docker /tmp || true',
 		]
 
 		const volumeMounts = [
-			this.templateVolumeMounts[ScaleSetVolumes.RUNNER],
 			this.templateVolumeMounts[ScaleSetVolumes.WORK],
 			this.templateVolumeMounts[ScaleSetVolumes.TMP],
 		]
@@ -423,20 +424,37 @@ export class ARCScaleSet extends blueprints.HelmAddOn {
 							},
 						},
 					],
-					volumeMounts,
+					volumeMounts: [
+						...volumeMounts,
+						{
+							...this.templateVolumeMounts[ScaleSetVolumes.RUNNER],
+							mountPath: '/runner',
+						},
+					],
 				},
 			],
 		}
 
+		const dindCommand = [
+			"sudo sed -i 's#startup.sh#/home/runner/run.sh#g' /usr/bin/entrypoint-dind.sh",
+			'/usr/bin/entrypoint-dind.sh',
+		]
+
 		const runner = {
 			containers: [
 				{
 					name: ScaleSetContainer.RUNNER,
 					image: runnerImage,
 					imagePullPolicy: 'IfNotPresent',
-					command: ['/home/runner/run.sh'],
+					command: this.options.useDindRunner
+						? ['bash', '-c', dindCommand.join(' && ')]
+						: ['/home/runner/run.sh'],
 					env,
-					volumeMounts,
+					volumeMounts: [
+						this.templateVolumeMounts[ScaleSetVolumes.RUNNER],
+						this.templateVolumeMounts[ScaleSetVolumes.DIND_CERT],
+						...volumeMounts,
+					],
 				},
 			],
 		}

diff --git a/packages/stacks/api/src/main.ts b/packages/stacks/api/src/main.ts
@@ -100,7 +100,7 @@ const pipeline = Pipeline.builder({
 						runnerScaleSetName: 'crisiscleanup-arc',
 						githubConfigSecret: 'arc-github-credentials',
 						containerImages: builderConfig.apiStack!.arc.images,
-						useDindRunner: true,
+						useDindRunner: false,
 					}),
 				)
 				.addOns(