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

This commit is contained in:
Ferenc Hammerl
2022-06-03 06:52:11 -07:00

View File

@@ -8,6 +8,7 @@ import {
ServiceContainerInfo,
StepContainerInfo
} from 'hooklib/lib'
import * as path from 'path'
import { env } from 'process'
import { v4 as uuidv4 } from 'uuid'
import { runDockerCommand, RunDockerCommandOptions } from '../utils'
@@ -147,7 +148,7 @@ export async function containerBuild(
tag: string
): Promise<void> {
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']
@@ -161,9 +162,7 @@ export async function containerBuild(
}
function getBuildContext(dockerfilePath: string): string {
const pathSplit = dockerfilePath.split('/')
pathSplit.splice(pathSplit.length - 1)
return pathSplit.join('/')
return path.dirname(dockerfilePath)
}
function getWorkingDir(dockerfilePath: string): string {