Skip to content

Commit 8ea3576

Browse files
authored
Merge pull request #2
Change context dir for docker build
2 parents 0f88138 + fd7431d commit 8ea3576

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/org/caf/Build.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def dockerBuild(osConfig, buildType, settings, index) {
158158
def varName = res.group(1)
159159
def varType = res.group(2)
160160
def value = res.group(3)
161-
init << """set($varName "$value" CACHE $varType "")\n"""
161+
init << """set($varName "$value" CACHE $varType "" FORCE)\n"""
162162
}
163163
init << """set(CAF_BUILD_INFO_FILE_PATH "$baseDir/build-${index}.info" CACHE FILEPATH "")\n""" \
164164
<< """set(CMAKE_INSTALL_PREFIX "$installDir" CACHE PATH "")\n""" \
@@ -173,7 +173,7 @@ def dockerBuild(osConfig, buildType, settings, index) {
173173
def numCores = settings['numCores'] ?: 1
174174
def extraEnv = numCores > 1 ? ["CAF_NUM_CORES=$numCores"] : []
175175
withEnv(settings['env'] + extraEnv) {
176-
def image = docker.build(imageName, "sources/.ci/${imageName}")
176+
def image = docker.build(imageName, "-f ${sourceDir}/.ci/${imageName}/Dockerfile ${sourceDir}")
177177
image.inside("--cap-add SYS_PTRACE") {
178178
settings['tags'].each {
179179
if (it != 'docker')

0 commit comments

Comments
 (0)