Skip to content

Commit 8c40821

Browse files
committed
update doc links and image name
1 parent 574486c commit 8c40821

File tree

2 files changed

+11
-18
lines changed

2 files changed

+11
-18
lines changed

docker/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ ARG VERSION=3.3.0
1212
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell
1313

1414
LABEL maintainer="Azure PowerShell Team <[email protected]>" \
15-
readme.md="https://github.com/Azure/azure-powershell/blob/master/docker/README.md" \
15+
readme.md="http://aka.ms/azpsdockerreadme" \
1616
description="This Dockerfile will install the latest release of Azure PowerShell." \
17-
org.label-schema.usage="TODO: official doc" \
18-
org.label-schema.url="https://github.com/Azure/azure-powershell/blob/master/docker/README.md" \
17+
org.label-schema.usage="http://aka.ms/azpsdocker" \
18+
org.label-schema.url="http://aka.ms/azpsdockerreadme" \
1919
org.label-schema.vcs-url="https://github.com/Azure/azure-powershell" \
2020
org.label-schema.name="azure powershell" \
2121
org.label-schema.vendor="Azure PowerShell" \
2222
org.label-schema.version=${VERSION} \
2323
org.label-schema.schema-version="1.0" \
2424
org.label-schema.vcs-ref=${VCS_REF} \
2525
org.label-schema.docker.cmd="docker run --rm ${IMAGE_NAME} pwsh -c '\$PSVERSIONTABLE'" \
26-
org.label-schema.docker.cmd.devel="docker run -it --rm -v ~/.Azure/AzureRmContext.json:/root/.Azure/AzureRmContext.json -v ~/.Azure/TokenCache.dat:/root/.Azure/TokenCache.dat ${IMAGE_NAME} pwsh -c Get-AzContext" \
26+
org.label-schema.docker.cmd.devel="docker run -it --rm -e 'DebugPreference=Continue' ${IMAGE_NAME} pwsh" \
2727
org.label-schema.docker.cmd.test="currently not available" \
2828
org.label-schema.docker.cmd.help="docker run --rm ${IMAGE_NAME} pwsh -c Get-Help"
2929

docker/README.md

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,26 @@ TODO: link to azure-powershell release page
2121
### Download/Update image
2222

2323
```sh
24-
docker pull mcr.microsoft.com/azure-powershell
24+
docker pull mcr.microsoft.com/azureps/azure-powershell
2525
```
2626

2727
### Run azure-powershell container
2828

2929
To run azure-powerShell from using a container in an interactive mode:
3030

3131
```sh
32-
$ docker run -it mcr.microsoft.com/azure-powershell pwsh
32+
$ docker run -it mcr.microsoft.com/azureps/azure-powershell pwsh
3333
```
3434
To run azure-powerShell from using a container in an interactive mode using host authentication,
3535
you need to make sure "~/.Azure" is existed (which is the default location) and you might need to grant docker to access this location:
3636

3737
```sh
38-
$ docker run -it -v ~/.Azure/AzureRmContext.json:/root/.Azure/AzureRmContext.json -v ~/.Azure/TokenCache.dat:/root/.Azure/TokenCache.dat mcr.microsoft.com/azure-powershell pwsh
38+
$ docker run -it -v ~/.Azure/AzureRmContext.json:/root/.Azure/AzureRmContext.json -v ~/.Azure/TokenCache.dat:/root/.Azure/TokenCache.dat mcr.microsoft.com/azureps/azure-powershell pwsh
3939
```
4040
To check host authentication:
4141

4242
```sh
43-
docker run -it --rm -v ~/.Azure/AzureRmContext.json:/root/.Azure/AzureRmContext.json -v ~/.Azure/TokenCache.dat:/root/.Azure/TokenCache.dat mcr.microsoft.com/azure-powershell pwsh -c Get-AzContext
43+
docker run -it --rm -v ~/.Azure/AzureRmContext.json:/root/.Azure/AzureRmContext.json -v ~/.Azure/TokenCache.dat:/root/.Azure/TokenCache.dat mcr.microsoft.com/azureps/azure-powershell pwsh -c Get-AzContext
4444
```
4545

4646
### Building image
@@ -51,13 +51,14 @@ In your local copy of azure-powershell repo, run:
5151
$ dotnet msbuild /t:Build /p:Configuration=Release
5252
$ dotnet msbuild /t:publish /p:Configuration=Release /p:NuGetKey=1234
5353
$ dotnet msbuild /t:BuildImage
54+
$ docker tag azure-powershell mcr.microsoft.com/azureps/azure-powershell
5455
$ docker images
5556
```
5657

5758
### Remove image
5859

5960
```sh
60-
docker rmi mcr.microsoft.com/azure-powershell
61+
docker rmi mcr.microsoft.com/azureps/azure-powershell
6162
```
6263

6364
## Developing and Contributing
@@ -76,19 +77,11 @@ Azure-PowerShell is licensed under the [MIT license][].
7677

7778
[MIT license]: https://github.com/Azure/azure-powershell/blob/master/LICENSE.txt
7879

79-
### Telemetry
80-
81-
By default, PowerShell collects the OS description and the version of PowerShell (equivalent to `$PSVersionTable.OS` and `$PSVersionTable.GitCommitId`) using [Application Insights](https://azure.microsoft.com/en-us/services/application-insights/).
82-
To opt-out of sending telemetry, create an environment variable called `POWERSHELL_TELEMETRY_OPTOUT` set to a value of `1` before starting PowerShell from the installed location.
83-
The telemetry we collect fall under the [Microsoft Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement/).
84-
85-
8680
## [Code of Conduct][conduct-md]
8781

8882
This project has adopted the [Microsoft Open Source Code of Conduct][conduct-code].
8983
For more information see the [Code of Conduct FAQ][conduct-FAQ] or contact [[email protected]][conduct-email] with any additional questions or comments.
9084

9185
[conduct-code]: http://opensource.microsoft.com/codeofconduct/
9286
[conduct-FAQ]: http://opensource.microsoft.com/codeofconduct/faq/
93-
[conduct-email]: mailto:[email protected]
94-
[conduct-md]: https://github.com/PowerShell/PowerShell/tree/master/./CODE_OF_CONDUCT.md
87+
[conduct-email]: mailto:[email protected]

0 commit comments

Comments
 (0)