diff options
| author | Daniel Stone <daniels@collabora.com> | 2020-09-03 20:17:39 +0100 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2020-11-26 17:50:56 +0000 |
| commit | 8e253356f1d4fd42c56f172c443906c53cc5138e (patch) | |
| tree | 3304297d492f0e2deb906d1a6d6324d02e66b288 /.gitlab-ci | |
| parent | 08a92f4094c927276a20f608d7b3c5de2a72e9e7 (diff) | |
CI: Windows: Use separate config file for Docker
Rather than relying on global state for 'docker login' credentials, use
a local file so we don't collide with other simultaneous builds.
[cross-picked from mesa/mesa@a2808108e805]
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/378>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/windows/container.ps1 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/.gitlab-ci/windows/container.ps1 b/.gitlab-ci/windows/container.ps1 index c68845198..7a2f6c237 100644 --- a/.gitlab-ci/windows/container.ps1 +++ b/.gitlab-ci/windows/container.ps1 @@ -9,28 +9,28 @@ $registry_central_image = $args[4] Set-Location -Path ".\.gitlab-ci\windows" -docker login -u "$registry_username" -p "$registry_password" "$registry_uri" +docker --config "windows-docker.conf" login -u "$registry_username" -p "$registry_password" "$registry_uri" if (!$?) { Write-Host "docker login failed to $registry_uri" Exit 1 } # if the image already exists, don't rebuild it -docker pull "$registry_user_image" +docker --config "windows-docker.conf" pull "$registry_user_image" if ($?) { Write-Host "User image $registry_user_image already exists; not rebuilding" - docker logout "$registry_uri" + docker --config "windows-docker.conf" logout "$registry_uri" Exit 0 } # if the image already exists upstream, copy it -docker pull "$registry_central_image" +docker --config "windows-docker.conf" pull "$registry_central_image" if ($?) { Write-Host "Copying central image $registry_central_image to user image $registry_user_image" - docker tag "$registry_central_image" "$registry_user_image" - docker push "$registry_user_image" + docker --config "windows-docker.conf" tag "$registry_central_image" "$registry_user_image" + docker --config "windows-docker.conf" push "$registry_user_image" $pushstatus = $? - docker logout "$registry_uri" + docker --config "windows-docker.conf" logout "$registry_uri" if (!$pushstatus) { Write-Host "Pushing image to $registry_user_image failed" Exit 1 @@ -39,17 +39,17 @@ if ($?) { } Write-Host "No image found at $registry_user_image or $registry_central_image; rebuilding" -docker build --no-cache -t "$registry_user_image" . +docker --config "windows-docker.conf" build --no-cache -t "$registry_user_image" . if (!$?) { Write-Host "Container build failed" - docker logout "$registry_uri" + docker --config "windows-docker.conf" logout "$registry_uri" Exit 1 } Get-Date -docker push "$registry_user_image" +docker --config "windows-docker.conf" push "$registry_user_image" $pushstatus = $? -docker logout "$registry_uri" +docker --config "windows-docker.conf" logout "$registry_uri" if (!$pushstatus) { Write-Host "Pushing image to $registry_user_image failed" Exit 1 |