Skip to content

Commit 26c0dbb

Browse files
azure-sdkscbedd
andauthored
remove all references to docker (#22614)
Co-authored-by: Scott Beddall (from Dev Box) <[email protected]>
1 parent d80f30f commit 26c0dbb

File tree

2 files changed

+2
-37
lines changed

2 files changed

+2
-37
lines changed

eng/common/testproxy/onboarding/common-asset-functions.ps1

-35
Original file line numberDiff line numberDiff line change
@@ -207,41 +207,6 @@ Function Invoke-ProxyCommand {
207207
)
208208
$updatedDirectory = $TargetDirectory.Replace("`\", "/")
209209

210-
# CommandString just a string indicating the proxy arguments. In the default case of running against the proxy tool, can just be used directly.
211-
# However, in the case of docker, we need to append a bunch more arguments to the string.
212-
if ($TestProxyExe -eq "docker" -or $TestProxyExe -eq "podman"){
213-
$token = $env:GIT_TOKEN
214-
$committer = $env:GIT_COMMIT_OWNER
215-
$email = $env:GIT_COMMIT_EMAIL
216-
217-
if (-not $committer) {
218-
$committer = & git config --global user.name
219-
}
220-
221-
if (-not $email) {
222-
$email = & git config --global user.email
223-
}
224-
225-
if(-not $token -or -not $committer -or -not $email){
226-
Write-Error ("When running this transition script in `"docker`" or `"podman`" mode, " `
227-
+ "the environment variables GIT_TOKEN, GIT_COMMIT_OWNER, and GIT_COMMIT_EMAIL must be set to reflect the appropriate user. ")
228-
exit 1
229-
}
230-
231-
$targetImage = if ($env:TRANSITION_SCRIPT_DOCKER_TAG) { $env:TRANSITION_SCRIPT_DOCKER_TAG } else { "azsdkengsys.azurecr.io/engsys/test-proxy:latest" }
232-
233-
$CommandString = @(
234-
"run --rm --name transition.test.proxy",
235-
"-v `"${updatedDirectory}:/srv/testproxy`"",
236-
"-e `"GIT_TOKEN=${token}`"",
237-
"-e `"GIT_COMMIT_OWNER=${committer}`"",
238-
"-e `"GIT_COMMIT_EMAIL=${email}`"",
239-
$targetImage,
240-
"test-proxy",
241-
$CommandString
242-
) -join " "
243-
}
244-
245210
Write-Host "$TestProxyExe $CommandString"
246211
[array] $output = & "$TestProxyExe" $CommandString.Split(" ") --storage-location="$updatedDirectory"
247212
# echo the command output

eng/common/testproxy/onboarding/generate-assets-json.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ Generated assets.json file contents
2222
If flag InitialPush is set, recordings will be automatically pushed to the assets repo and the Tag property updated.
2323
2424
.PARAMETER TestProxyExe
25-
The executable used during the "InitialPush" action. Defaults to the dotnet tool test-proxy, but also supports "docker" or "podman".
25+
The executable used during the "InitialPush" action. Defaults to the dotnet tool test-proxy, but also supports custom executables as well.
2626
27-
If the user provides their own value that doesn't match options "test-proxy", "docker", or "podman", the script will use this input as the test-proxy exe
27+
If the user provides their own value that doesn't match options "test-proxy" the script will use this input as the test-proxy exe
2828
when invoking commands. EG "$TestProxyExe push -a sdk/keyvault/azure-keyvault-keys/assets.json."
2929
3030
.PARAMETER InitialPush

0 commit comments

Comments
 (0)