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

repaired docker PATH export and added tests both for docker and k8s (#17)

Browse Source 
* repaired docker PATH export and added tests both for docker and k8s

* added todo comments about next major version and typeof prepend path
This commit is contained in:
Nikola Jokic
2022-06-16 15:44:40 +02:00
committed by GitHub
parent 266b8edb99
commit 898063bddd
4 changed files with 86 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/docker/src/dockerCommands/container.ts
View File

@@ -274,6 +274,20 @@ export async function containerPorts(id: string): Promise<string[]> {
return portMappings.split('\n').filter(p => !!p)
}
export async function getContainerEnvValue(
id: string,
name: string
): Promise<string> {
const dockerArgs = [
'inspect',
`--format='{{range $index, $value := .Config.Env}}{{if eq (index (split $value "=") 0) "${name}"}}{{index (split $value "=") 1}}{{end}}{{end}}'`,
id
]
const value = (await runDockerCommand(dockerArgs)).trim()
const lines = value.split('\n')
return lines.length ? lines[0].replace(/^'/, '').replace(/'$/, '') : ''
}
export async function registryLogin(registry?: Registry): Promise<string> {
if (!registry) {
return ''
@@ -346,7 +360,16 @@ export async function containerExecStep(
}
if (args.prependPath?.length) {
dockerArgs.push('-e', `"PATH=${args.prependPath.join(':')}:$PATH"`)
// TODO: remove compatibility with typeof prependPath === 'string' as we bump to next major version, the hooks will lose PrependPath compat with runners 2.293.0 and older
const prependPath =
typeof args.prependPath === 'string'
? args.prependPath
: args.prependPath.join(':')
dockerArgs.push(
'-e',
`PATH=${prependPath}:${await getContainerEnvValue(containerId, 'PATH')}`
)
}
dockerArgs.push(containerId)

24
packages/docker/tests/run-script-step-test.ts
View File

@@ -34,4 +34,28 @@ describe('run script step', () => {
runScriptStep(definitions.runScriptStep.args, prepareJobResponse.state)
).resolves.not.toThrow()
})
it('Should have path variable changed in container with prepend path string', async () => {
definitions.runScriptStep.args.prependPath = '/some/path'
definitions.runScriptStep.args.entryPoint = '/bin/bash'
definitions.runScriptStep.args.entryPointArgs = [
'-c',
`if [[ ! $(env | grep "^PATH=") = "PATH=${definitions.runScriptStep.args.prependPath}:"* ]]; then exit 1; fi`
]
await expect(
runScriptStep(definitions.runScriptStep.args, prepareJobResponse.state)
).resolves.not.toThrow()
})
it('Should have path variable changed in container with prepend path string array', async () => {
definitions.runScriptStep.args.prependPath = ['/some/other/path']
definitions.runScriptStep.args.entryPoint = '/bin/bash'
definitions.runScriptStep.args.entryPointArgs = [
'-c',
`if [[ ! $(env | grep "^PATH=") = "PATH=${definitions.runScriptStep.args.prependPath}:"* ]]; then exit 1; fi`
]
await expect(
runScriptStep(definitions.runScriptStep.args, prepareJobResponse.state)
).resolves.not.toThrow()
})
})