Skip to content

Commit 266b89d

Browse files
authored
Merge pull request #3 from dcaro/create_docker_image
Create docker image
2 parents c123197 + f050c00 commit 266b89d

File tree

2 files changed

+24
-17
lines changed

2 files changed

+24
-17
lines changed

.github/ISSUE_TEMPLATE/az-module-bug-report.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ assignees: ''
2929

3030
## Environment data
3131

32-
<!-- Please run $PSVersionTable and paste the output in the below code block -->
32+
<!-- Please run $PSVersionTable and paste the output in the below code block
33+
If running the Docker container image, indicate the tag of the image used and the version of Docker engine-->
3334

3435
```
3536

docker/README.md

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,56 +2,59 @@
22

33

44
## Overview
5-
This Dockerfile enable running Azure-PowerShell in a container for OS we support.
6-
5+
These Dockerfiles enable executing Azure-PowerShell cmdlets in a container for the supported OS.
76

87
## Configuration
9-
This requires Docker 17.05 or newer.
10-
It also expects you to be able to run Docker without `sudo`.
8+
This image requires Docker 17.05 or newer.
9+
10+
It is also expected that you are able to run Docker without `sudo`.
1111
Please follow [Docker's official instructions][install] to install `docker` correctly.
1212

1313
[install]: https://docs.docker.com/engine/installation/
1414

1515

1616
## Release
1717

18-
The release containers derive from the [Powershell image][powershell image], and then install the Az package.
18+
The release containers derive from the [Powershell image][powershell image], and then install the current Az package.
1919

2020
[powershell image]: https://hub.docker.com/_/microsoft-powershell
2121

22-
TODO: link to azure-powershell release page
23-
22+
Azure PowerShell [release notes](https://docs.microsoft.com/en-us/powershell/azure/release-notes-azureps)
2423

2524
## Examples
2625

27-
### Download/Update image
26+
### Download/Update the azure-powershell image
2827

2928
```sh
30-
docker pull mcr.microsoft.com/azureps/azure-powershell
29+
docker pull mcr.microsoft.com/azure-powershell
3130
```
3231

3332
### Run azure-powershell container
3433

35-
To run azure-powerShell from using a container in an interactive mode:
34+
- To run azure-powershell using a container in an interactive mode:
3635

3736
```sh
3837
$ docker run -it mcr.microsoft.com/azureps/azure-powershell pwsh
3938
```
40-
To run azure-powerShell from using a container in an interactive mode using host authentication,
41-
you need to make sure "~/.Azure" is existed (which is the default location) and you might need to grant docker to access this location:
39+
40+
- To run azure-powershell from using a container in an interactive mode using host authentication:
41+
42+
1- Make sure that `$HOME/.Azure` is present on the host (default location)
43+
2- You may need to grant access this location for the docker process.
4244

4345
```sh
4446
$ 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
4547
```
46-
To check host authentication:
48+
49+
Verify the host authentication:
4750

4851
```sh
4952
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
5053
```
5154

5255
### Building image
5356

54-
In your local copy of azure-powershell repo, run:
57+
Clone the azure-powershell repo, and in your local copy run the following commands:
5558

5659
```sh
5760
$ dotnet msbuild /t:Build /p:Configuration=Release
@@ -67,7 +70,6 @@ $ docker images
6770
docker rmi mcr.microsoft.com/azureps/azure-powershell
6871
```
6972

70-
7173
## Developing and Contributing
7274

7375
Please see the [Contribution Guide][] for general information about how to develop and contribute.
@@ -77,7 +79,7 @@ If you do not see your problem captured, please file a [new issue][] and follow
7779

7880
[Contribution Guide]: https://github.com/Azure/azure-powershell/blob/master/CONTRIBUTING.md
7981
[GitHub issues]: https://github.com/Azure/azure-powershell/issues
80-
[new issue]:https://github.com/Azure/azure-powershell/issues/new
82+
[new issue]:https://aka.ms/azpsissue
8183

8284

8385
## Legal and Licensing
@@ -87,6 +89,10 @@ Azure-PowerShell is licensed under the [MIT license][].
8789
[MIT license]: https://github.com/Azure/azure-powershell/blob/master/LICENSE.txt
8890

8991

92+
PowerShell is licensed under the [MIT license][].
93+
94+
[MIT license]: https://github.com/PowerShell/PowerShell/tree/master/LICENSE.txt
95+
9096
## [Code of Conduct][conduct-md]
9197

9298
This project has adopted the [Microsoft Open Source Code of Conduct][conduct-code].

0 commit comments

Comments
 (0)