From e5e675440b44ace7d7a9e7bc303f877c06b59ea5 Mon Sep 17 00:00:00 2001 From: Ben Broderick Phillips Date: Tue, 19 Dec 2023 13:32:01 -0500 Subject: [PATCH] Move squid image to registry mirror (#5218) * Move squid image to registry mirror * Add comments regarding private registry --- .../test/ut/proxy_tests/localproxy.passwd/Dockerfile | 2 +- .../azure-core/test/ut/proxy_tests/localproxy/Dockerfile | 2 +- sdk/core/azure-core/test/ut/proxy_tests/readme.md | 3 +-- .../test/ut/proxy_tests/remoteproxy.passwd/Dockerfile | 3 ++- .../azure-core/test/ut/proxy_tests/remoteproxy/Dockerfile | 2 +- sdk/core/ci.yml | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sdk/core/azure-core/test/ut/proxy_tests/localproxy.passwd/Dockerfile b/sdk/core/azure-core/test/ut/proxy_tests/localproxy.passwd/Dockerfile index 5b1a57701..846adee8a 100644 --- a/sdk/core/azure-core/test/ut/proxy_tests/localproxy.passwd/Dockerfile +++ b/sdk/core/azure-core/test/ut/proxy_tests/localproxy.passwd/Dockerfile @@ -3,7 +3,7 @@ # Licensed under the MIT License. # DisableDockerDetector "This was used for testing in the past. If such testing can be supported in the future this container will be used again." -FROM ubuntu/squid +FROM azsdkengsys.azurecr.io/mirror/ubuntu/squid LABEL maintainer "Larry Osterman" ENV NGINX_VERSION 1.23.1 diff --git a/sdk/core/azure-core/test/ut/proxy_tests/localproxy/Dockerfile b/sdk/core/azure-core/test/ut/proxy_tests/localproxy/Dockerfile index ac2958893..6bebd796d 100644 --- a/sdk/core/azure-core/test/ut/proxy_tests/localproxy/Dockerfile +++ b/sdk/core/azure-core/test/ut/proxy_tests/localproxy/Dockerfile @@ -3,7 +3,7 @@ # Licensed under the MIT License. # DisableDockerDetector "This was used for testing in the past. If such testing can be supported in the future this container will be used again." -FROM ubuntu/squid +FROM azsdkengsys.azurecr.io/mirror/ubuntu/squid LABEL maintainer "Larry Osterman" ENV NGINX_VERSION 1.23.1 diff --git a/sdk/core/azure-core/test/ut/proxy_tests/readme.md b/sdk/core/azure-core/test/ut/proxy_tests/readme.md index 36c10809a..ade206560 100644 --- a/sdk/core/azure-core/test/ut/proxy_tests/readme.md +++ b/sdk/core/azure-core/test/ut/proxy_tests/readme.md @@ -4,8 +4,7 @@ Running the proxy tests requires two docker containers, one hosting an anonymous squid proxy, the other hosting an authenticated squid proxy. -This container is derived from the ubuntu/squid container on dockerhub. This container is maintained by the Ubuntu team and has -a current version of Ubuntu in it, with a version of squid built to match. +This container is derived from the `azsdkengsys.azurecr.io/mirror/ubuntu/squid` container, and requires [authentication to the azsdkengsys container registry](https://learn.microsoft.com/azure/container-registry/container-registry-authentication?tabs=azure-cli) to pull. This container is mirrored from ubuntu/squid on dockerhub, maintained by the Ubuntu team and has a current version of Ubuntu in it, with a version of squid built to match. To update the image in the mirror, see [this pipeline](https://dev.azure.com/azure-sdk/internal/_build/index?definitionId=6572). ## Building the container diff --git a/sdk/core/azure-core/test/ut/proxy_tests/remoteproxy.passwd/Dockerfile b/sdk/core/azure-core/test/ut/proxy_tests/remoteproxy.passwd/Dockerfile index 0089cdfab..0f251f8df 100644 --- a/sdk/core/azure-core/test/ut/proxy_tests/remoteproxy.passwd/Dockerfile +++ b/sdk/core/azure-core/test/ut/proxy_tests/remoteproxy.passwd/Dockerfile @@ -3,7 +3,8 @@ # Licensed under the MIT License. # DisableDockerDetector "This was used for testing in the past. If such testing can be supported in the future this container will be used again." -FROM ubuntu/squid +# NOTE: this registry requires authentication in order to be pulled from. +FROM azsdkengsys.azurecr.io/mirror/ubuntu/squid LABEL maintainer "Larry Osterman" ENV NGINX_VERSION 1.23.1 diff --git a/sdk/core/azure-core/test/ut/proxy_tests/remoteproxy/Dockerfile b/sdk/core/azure-core/test/ut/proxy_tests/remoteproxy/Dockerfile index ac2958893..6bebd796d 100644 --- a/sdk/core/azure-core/test/ut/proxy_tests/remoteproxy/Dockerfile +++ b/sdk/core/azure-core/test/ut/proxy_tests/remoteproxy/Dockerfile @@ -3,7 +3,7 @@ # Licensed under the MIT License. # DisableDockerDetector "This was used for testing in the past. If such testing can be supported in the future this container will be used again." -FROM ubuntu/squid +FROM azsdkengsys.azurecr.io/mirror/ubuntu/squid LABEL maintainer "Larry Osterman" ENV NGINX_VERSION 1.23.1 diff --git a/sdk/core/ci.yml b/sdk/core/ci.yml index 5685eee38..4dffe8da8 100644 --- a/sdk/core/ci.yml +++ b/sdk/core/ci.yml @@ -76,10 +76,10 @@ stages: # workingDirectory: $(Build.SourcesDirectory)/sdk/core/azure-core/test/ut/proxy_tests # displayName: Verify Proxy Server Working Correctly. # condition: and(succeeded(), variables.RunProxyTests, contains(variables.CmakeArgs, 'BUILD_TESTING=ON')) - + # PostTestSteps: # - pwsh: | -# docker ps -q -f ancestor=ubuntu/squid | ForEach-Object { ` +# docker ps -q -f ancestor=azsdkengsys.azurecr.io/mirror/ubuntu/squid | ForEach-Object { ` # docker stop $_ ` # } # displayName: Shutdown Squid Proxy. @@ -102,7 +102,7 @@ stages: Value: "https://non-real-account.vault.azure.net" - Name: AZURE_KEYVAULT_HSM_URL Value: "https://non-real-account.managedhsm.azure.net/" -# Key Vault & Identity +# Key Vault & Identity - Name: AZURE_TENANT_ID Value: "33333333-3333-3333-3333-333333333333" - Name: AZURE_CLIENT_ID