github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move squid image to registry mirror (#5218)

Browse Source 
* Move squid image to registry mirror

* Add comments regarding private registry
This commit is contained in:
Ben Broderick Phillips 2023-12-19 13:32:01 -05:00 committed by GitHub
parent e328665588
commit e5e675440b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/core/azure-core/test/ut/proxy_tests/localproxy.passwd/Dockerfile
View File

@ -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<github.com/LarryOsterman>"
ENV NGINX_VERSION 1.23.1

2
sdk/core/azure-core/test/ut/proxy_tests/localproxy/Dockerfile
View File

@ -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<github.com/LarryOsterman>"
ENV NGINX_VERSION 1.23.1

3
sdk/core/azure-core/test/ut/proxy_tests/readme.md
View File

@ -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

3
sdk/core/azure-core/test/ut/proxy_tests/remoteproxy.passwd/Dockerfile
View File

@ -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<github.com/LarryOsterman>"
ENV NGINX_VERSION 1.23.1

2
sdk/core/azure-core/test/ut/proxy_tests/remoteproxy/Dockerfile
View File

@ -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<github.com/LarryOsterman>"
ENV NGINX_VERSION 1.23.1

6
sdk/core/ci.yml
View File

@ -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