From 7fc3e4e4ef5c1028e2cfebd19f6ec815772fd771 Mon Sep 17 00:00:00 2001 From: prestoncraw Date: Thu, 24 Sep 2026 15:29:49 -0400 Subject: [PATCH] Re-enable docker build and point it to correct instance --- Jenkinsfile | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6d86b89c..bfe6ccdd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -233,19 +233,34 @@ pipeline { } steps { script { - //env.pqBrowserDockerTag = env.CHANGE_BRANCH == "${env.devBranch}" ? "${env.pqBrowserVersion}a" : env.pqBrowserVersion - //println("Building PQBrowser Docker image tag: pqbrowser:${env.pqBrowserDockerTag}") - println("Skipping docker stage intentionally") + env.pqBrowserDockerTag = env.CHANGE_BRANCH == "${env.devBranch}" ? "${env.pqBrowserVersion}a" : env.pqBrowserVersion + println("Building PQBrowser Docker image tag: pqbrowser:${env.pqBrowserDockerTag}") } - /*powershell """ + powershell """ dotnet publish '.\\PQBrowser\\PQBrowser.csproj' ` --configuration Release ` '-p:PublishProfile=Docker Release Profile PQBrowser' """ - powershell "docker build --build-arg CONFIGURATION=Release -f .\\PQBrowser.dockerfile -t pqbrowser:${env.pqBrowserDockerTag} ." - */ + withCredentials([ + string(credentialsId: 'wsl-docker-user', variable: 'WSL_DOCKER_USER') + ]) { + powershell ''' + $key = 'C:\\ProgramData\\Jenkins\\.ssh\\wsl_docker' + $wslPath = '/mnt/' + $env:WORKSPACE.Substring(0, 1).ToLowerInvariant() + $env:WORKSPACE.Substring(2).Replace('\\', '/') + + ssh -i $key ` + -o BatchMode=yes ` + -p 2222 ` + "$env:WSL_DOCKER_USER@localhost" ` + "cd '$wslPath' && docker info --format '{{.OSType}}' && docker build --build-arg CONFIGURATION=Release -f ./PQBrowser.dockerfile -t 'pqbrowser:$env:pqBrowserDockerTag' ." + + if ($LASTEXITCODE -ne 0) { + exit $LASTEXITCODE + } + ''' + } } }