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

Merge branch 'nikola-jokic/computed-build-directory' of github.com:actions/runner-container-hooks into nikola-jokic/computed-build-directory

Browse Source
This commit is contained in:
Ferenc Hammerl
2022-06-03 06:52:11 -07:00
parent 171956673c b0cf60b678
commit 1e49f4ba5b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ import {
ServiceContainerInfo, ServiceContainerInfo,
StepContainerInfo StepContainerInfo
} from 'hooklib/lib' } from 'hooklib/lib'
import * as path from 'path'
import { env } from 'process' import { env } from 'process'
import { v4 as uuidv4 } from 'uuid' import { v4 as uuidv4 } from 'uuid'
import { runDockerCommand, RunDockerCommandOptions } from '../utils' import { runDockerCommand, RunDockerCommandOptions } from '../utils'
@@ -147,7 +148,7 @@ export async function containerBuild(
tag: string tag: string
): Promise<void> { ): Promise<void> {
if (!args.dockerfile) { if (!args.dockerfile) {
throw new Error('Container build expets args.dockerfile to be set') throw new Error("Container build expects 'args.dockerfile' to be set")
} }
const dockerArgs: string[] = ['build'] const dockerArgs: string[] = ['build']
@@ -161,9 +162,7 @@ export async function containerBuild(
} }
function getBuildContext(dockerfilePath: string): string { function getBuildContext(dockerfilePath: string): string {
const pathSplit = dockerfilePath.split('/') return path.dirname(dockerfilePath)
pathSplit.splice(pathSplit.length - 1)
return pathSplit.join('/')
} }
function getWorkingDir(dockerfilePath: string): string { function getWorkingDir(dockerfilePath: string): string {