actions/runner-container-hooks
1
0
Fork 0
mirror of https://github.com/actions/runner-container-hooks.git synced 2025-12-14 00:26:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed prepare-job for docker to allow for no job container

Browse Source
This commit is contained in:
Nikola Jokic
2022-06-10 11:56:10 +02:00
parent 7ae8942b3d
commit bf362ba0dd
3 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/docker/src/hooks/prepare-job.ts
View File

@@ -94,7 +94,10 @@ export async function prepareJob(
)
}
const isAlpine = await isContainerAlpine(containerMetadata!.id)
let isAlpine = false
if (containerMetadata?.id) {
isAlpine = await isContainerAlpine(containerMetadata.id)
}
if (containerMetadata?.id) {
containerMetadata.ports = await containerPorts(containerMetadata.id)
@@ -105,7 +108,10 @@ export async function prepareJob(
}
}
const healthChecks: Promise<void>[] = [healthCheck(containerMetadata!)]
const healthChecks: Promise<void>[] = []
if (containerMetadata) {
healthChecks.push(healthCheck(containerMetadata))
}
for (const service of servicesMetadata) {
healthChecks.push(healthCheck(service))
}

10
packages/docker/tests/prepare-job-test.ts
View File

@@ -118,4 +118,14 @@ describe('prepare job', () => {
expect(redisServicePorts['80']).toBe('8080')
expect(redisServicePorts['8080']).toBe('8088')
})
it('should run prepare job without job container without exception', async () => {
prepareJobDefinition.args.container = null
const prepareJobOutput = testSetup.createOutputFile(
'prepare-job-output.json'
)
await expect(
prepareJob(prepareJobDefinition.args, prepareJobOutput)
).resolves.not.toThrow()
})
})