Skip to content

Commit 20160e6

Browse files
NickcandyNickcandy
authored
Revise smoke test and change Docker files (#18263)
* upgrade get-azlocation cmd(upgrade subcriptionclient version, add extend location peremeter, and expose more info * update test for azlocation * add changlog * revise changlog.md:delete new title * revise changlog.md * add dockerfiles for debian10,debian11,mairin1,ubuntu2204 * revise docker file name * change parameter to singular noun * revise session record json file * revise docker file * revise docker file * revise session record json file * revise session record json file * revise session record json file * revise session record json file * revise session record json file * revise session record json file * revise session record json file * add parameter(failOnStandardError: true) for smoketest * add parameter(failOnStandardError: true) for smoketest * change testcase in smoke test.getazadgroup -> get-azaduser * change testcase in smoke test.getazadgroup -> get-azaduser * change testcase in smoke test.getazadgroup -> get-azaduser * change docker file
1 parent 39b199f commit 20160e6

11 files changed

+239
-30
lines changed

‎.azure-pipelines/util/smoke-test-steps.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,16 @@ jobs:
102102
inputs:
103103
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
104104
arguments: '-RequiredPsVersion ${{ parameters.psVersion }} -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1 "'
105+
failOnStderr: true
106+
105107

106108
- task: PowerShell@2
107109
displayName: 'Run Smoke Test Reversely'
108110
inputs:
109111
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
110112
arguments: '-RequiredPsVersion ${{ parameters.psVersion }} -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1 -Reverse"'
113+
failOnStderr: true
114+
111115

112116
- task: PowerShell@2
113117
displayName: Clean Az Modules
@@ -126,12 +130,16 @@ jobs:
126130
inputs:
127131
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
128132
arguments: '-RequiredPsVersion ${{ parameters.psVersion }} -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1 "'
133+
failOnStderr: true
134+
129135

130136
- task: PowerShell@2
131137
displayName: 'Run Smoke Test Reversely'
132138
inputs:
133139
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
134140
arguments: '-RequiredPsVersion ${{ parameters.psVersion }} -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1 -Reverse "'
141+
failOnStderr: true
142+
135143

136144
- task: PowerShell@2
137145
displayName: Clean Az Modules

‎docker/Dockerfile-alpine-3.13

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ARG AZURE=/root/.Azure
88
ARG VCS_REF="none"
99
ARG BUILD_DATE=
1010
ARG VERSION=
11+
ARG LATEST=
1112
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-alpine-3.13
1213

1314
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-alpine-3.13"
@@ -29,10 +30,18 @@ LABEL maintainer="Azure PowerShell Team <[email protected]>" \
2930
org.label-schema.docker.cmd.test="currently not available" \
3031
org.label-schema.docker.cmd.help="docker run --rm ${IMAGE_NAME} pwsh -c Get-Help"
3132

32-
# install azure-powershell from PSGallery
33-
RUN pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Trusted && \
34-
pwsh -Command Install-Module -Name ${MODULE} -RequiredVersion ${VERSION} -Scope AllUsers -Repository ${REPOSITORY} && \
35-
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Untrusted
33+
RUN if [ "${LATEST}" = True ] ; then \
34+
# install latest azure-powershell from BLOB
35+
pwsh -Command Invoke-WebRequest -uri ${BLOB_URL} -OutFile latest.tar.gz && \
36+
mkdir latest && \
37+
tar -zxvf ./latest.tar.gz -C ./latest && \
38+
pwsh -Command ./latest/InstallModule.ps1 ;\
39+
else \
40+
# install old azure-powershell from PSGallery
41+
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Trusted && \
42+
pwsh -Command Install-Module -Name ${MODULE} -RequiredVersion ${VERSION} -Scope AllUsers -Repository ${REPOSITORY} && \
43+
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Untrusted ;\
44+
fi
3645

3746
# create AzureRmContextSettings.json before it was generated
3847
COPY ${CONFIG}/${AZURERM_CONTEXT_SETTINGS} ${AZURE}/${AZURERM_CONTEXT_SETTINGS}

‎docker/Dockerfile-alpine-3.14

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ARG AZURE=/root/.Azure
88
ARG VCS_REF="none"
99
ARG BUILD_DATE=
1010
ARG VERSION=
11+
ARG LATEST=
1112
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-alpine-3.14
1213

1314
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-alpine-3.14"
@@ -29,10 +30,18 @@ LABEL maintainer="Azure PowerShell Team <[email protected]>" \
2930
org.label-schema.docker.cmd.test="currently not available" \
3031
org.label-schema.docker.cmd.help="docker run --rm ${IMAGE_NAME} pwsh -c Get-Help"
3132

32-
# install azure-powershell from PSGallery
33-
RUN pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Trusted && \
34-
pwsh -Command Install-Module -Name ${MODULE} -RequiredVersion ${VERSION} -Scope AllUsers -Repository ${REPOSITORY} && \
35-
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Untrusted
33+
RUN if [ "${LATEST}" = True ] ; then \
34+
# install latest azure-powershell from BLOB
35+
pwsh -Command Invoke-WebRequest -uri ${BLOB_URL} -OutFile latest.tar.gz && \
36+
mkdir latest && \
37+
tar -zxvf ./latest.tar.gz -C ./latest && \
38+
pwsh -Command ./latest/InstallModule.ps1 ;\
39+
else \
40+
# install old azure-powershell from PSGallery
41+
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Trusted && \
42+
pwsh -Command Install-Module -Name ${MODULE} -RequiredVersion ${VERSION} -Scope AllUsers -Repository ${REPOSITORY} && \
43+
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Untrusted ;\
44+
fi
3645

3746
# create AzureRmContextSettings.json before it was generated
3847
COPY ${CONFIG}/${AZURERM_CONTEXT_SETTINGS} ${AZURE}/${AZURERM_CONTEXT_SETTINGS}

‎docker/Dockerfile-centos-7

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ARG AZURE=/root/.Azure
88
ARG VCS_REF="none"
99
ARG BUILD_DATE=
1010
ARG VERSION=
11+
ARG LATEST=
1112
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-centos-7
1213

1314
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-centos-7"
@@ -29,11 +30,18 @@ LABEL maintainer="Azure PowerShell Team <[email protected]>" \
2930
org.label-schema.docker.cmd.test="currently not available" \
3031
org.label-schema.docker.cmd.help="docker run --rm ${IMAGE_NAME} pwsh -c Get-Help"
3132

32-
# install azure-powershell from PSGallery
33-
RUN pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Trusted && \
34-
pwsh -Command Install-Module -Name ${MODULE} -RequiredVersion ${VERSION} -Scope AllUsers -Repository ${REPOSITORY} && \
35-
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Untrusted
36-
33+
RUN if [ "${LATEST}" = True ] ; then \
34+
# install latest azure-powershell from BLOB
35+
pwsh -Command Invoke-WebRequest -uri ${BLOB_URL} -OutFile latest.tar.gz && \
36+
mkdir latest && \
37+
tar -zxvf ./latest.tar.gz -C ./latest && \
38+
pwsh -Command ./latest/InstallModule.ps1 ;\
39+
else \
40+
# install old azure-powershell from PSGallery
41+
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Trusted && \
42+
pwsh -Command Install-Module -Name ${MODULE} -RequiredVersion ${VERSION} -Scope AllUsers -Repository ${REPOSITORY} && \
43+
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Untrusted ;\
44+
fi
3745
# create AzureRmContextSettings.json before it was generated
3846
COPY ${CONFIG}/${AZURERM_CONTEXT_SETTINGS} ${AZURE}/${AZURERM_CONTEXT_SETTINGS}
3947

‎docker/Dockerfile-debian-9 renamed to ‎docker/Dockerfile-debian-10

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/powershell:debian-9
1+
FROM mcr.microsoft.com/powershell:debian-10
22

33
ARG REPOSITORY=PSGallery
44
ARG MODULE=Az
@@ -8,9 +8,10 @@ ARG AZURE=/root/.Azure
88
ARG VCS_REF="none"
99
ARG BUILD_DATE=
1010
ARG VERSION=
11-
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-debian-9
11+
ARG LATEST=
12+
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-debian-10
1213

13-
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-debian-9"
14+
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-debian-10"
1415

1516
LABEL maintainer="Azure PowerShell Team <[email protected]>" \
1617
readme.md="http://aka.ms/azpsdockerreadme" \
@@ -29,10 +30,18 @@ LABEL maintainer="Azure PowerShell Team <[email protected]>" \
2930
org.label-schema.docker.cmd.test="currently not available" \
3031
org.label-schema.docker.cmd.help="docker run --rm ${IMAGE_NAME} pwsh -c Get-Help"
3132

32-
# install azure-powershell from PSGallery
33-
RUN pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Trusted && \
34-
pwsh -Command Install-Module -Name ${MODULE} -RequiredVersion ${VERSION} -Scope AllUsers -Repository ${REPOSITORY} && \
35-
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Untrusted
33+
RUN if [ "${LATEST}" = True ] ; then \
34+
# install latest azure-powershell from BLOB
35+
pwsh -Command Invoke-WebRequest -uri ${BLOB_URL} -OutFile latest.tar.gz && \
36+
mkdir latest && \
37+
tar -zxvf ./latest.tar.gz -C ./latest && \
38+
pwsh -Command ./latest/InstallModule.ps1 ;\
39+
else \
40+
# install old azure-powershell from PSGallery
41+
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Trusted && \
42+
pwsh -Command Install-Module -Name ${MODULE} -RequiredVersion ${VERSION} -Scope AllUsers -Repository ${REPOSITORY} && \
43+
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Untrusted ;\
44+
fi
3645

3746
# create AzureRmContextSettings.json before it was generated
3847
COPY ${CONFIG}/${AZURERM_CONTEXT_SETTINGS} ${AZURE}/${AZURERM_CONTEXT_SETTINGS}

‎docker/Dockerfile-debian-11

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
FROM mcr.microsoft.com/powershell:debian-11
2+
3+
ARG REPOSITORY=PSGallery
4+
ARG MODULE=Az
5+
ARG CONFIG=config
6+
ARG AZURERM_CONTEXT_SETTINGS=AzureRmContextSettings.json
7+
ARG AZURE=/root/.Azure
8+
ARG VCS_REF="none"
9+
ARG BUILD_DATE=
10+
ARG VERSION=
11+
ARG LATEST=
12+
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-debian-11
13+
14+
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-debian-11"
15+
16+
LABEL maintainer="Azure PowerShell Team <[email protected]>" \
17+
readme.md="http://aka.ms/azpsdockerreadme" \
18+
description="This Dockerfile will install the latest release of Azure PowerShell." \
19+
org.label-schema.build-date=${BUILD_DATE} \
20+
org.label-schema.usage="http://aka.ms/azpsdocker" \
21+
org.label-schema.url="http://aka.ms/azpsdockerreadme" \
22+
org.label-schema.vcs-url="https://github.com/Azure/azure-powershell" \
23+
org.label-schema.name="azure powershell" \
24+
org.label-schema.vendor="Azure PowerShell" \
25+
org.label-schema.version=${VERSION} \
26+
org.label-schema.schema-version="1.0" \
27+
org.label-schema.vcs-ref=${VCS_REF} \
28+
org.label-schema.docker.cmd="docker run --rm ${IMAGE_NAME} pwsh -c '\$PSVERSIONTABLE'" \
29+
org.label-schema.docker.cmd.devel="docker run -it --rm -e 'DebugPreference=Continue' ${IMAGE_NAME} pwsh" \
30+
org.label-schema.docker.cmd.test="currently not available" \
31+
org.label-schema.docker.cmd.help="docker run --rm ${IMAGE_NAME} pwsh -c Get-Help"
32+
33+
RUN if [ "${LATEST}" = True ] ; then \
34+
# install latest azure-powershell from BLOB
35+
pwsh -Command Invoke-WebRequest -uri ${BLOB_URL} -OutFile latest.tar.gz && \
36+
mkdir latest && \
37+
tar -zxvf ./latest.tar.gz -C ./latest && \
38+
pwsh -Command ./latest/InstallModule.ps1 ;\
39+
else \
40+
# install old azure-powershell from PSGallery
41+
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Trusted && \
42+
pwsh -Command Install-Module -Name ${MODULE} -RequiredVersion ${VERSION} -Scope AllUsers -Repository ${REPOSITORY} && \
43+
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Untrusted ;\
44+
fi
45+
46+
# create AzureRmContextSettings.json before it was generated
47+
COPY ${CONFIG}/${AZURERM_CONTEXT_SETTINGS} ${AZURE}/${AZURERM_CONTEXT_SETTINGS}
48+
49+
CMD [ "pwsh" ]

‎docker/Dockerfile-mariner-1

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
FROM mcr.microsoft.com/powershell:preview-mariner-1.0
2+
3+
ARG REPOSITORY=PSGallery
4+
ARG MODULE=Az
5+
ARG CONFIG=config
6+
ARG AZURERM_CONTEXT_SETTINGS=AzureRmContextSettings.json
7+
ARG AZURE=/root/.Azure
8+
ARG VCS_REF="none"
9+
ARG BUILD_DATE=
10+
ARG VERSION=
11+
ARG LATEST=
12+
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-mariner-1.0
13+
14+
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-mariner-1.0"
15+
16+
LABEL maintainer="Azure PowerShell Team <[email protected]>" \
17+
readme.md="http://aka.ms/azpsdockerreadme" \
18+
description="This Dockerfile will install the latest release of Azure PowerShell." \
19+
org.label-schema.build-date=${BUILD_DATE} \
20+
org.label-schema.usage="http://aka.ms/azpsdocker" \
21+
org.label-schema.url="http://aka.ms/azpsdockerreadme" \
22+
org.label-schema.vcs-url="https://github.com/Azure/azure-powershell" \
23+
org.label-schema.name="azure powershell" \
24+
org.label-schema.vendor="Azure PowerShell" \
25+
org.label-schema.version=${VERSION} \
26+
org.label-schema.schema-version="1.0" \
27+
org.label-schema.vcs-ref=${VCS_REF} \
28+
org.label-schema.docker.cmd="docker run --rm ${IMAGE_NAME} pwsh -c '\$PSVERSIONTABLE'" \
29+
org.label-schema.docker.cmd.devel="docker run -it --rm -e 'DebugPreference=Continue' ${IMAGE_NAME} pwsh" \
30+
org.label-schema.docker.cmd.test="currently not available" \
31+
org.label-schema.docker.cmd.help="docker run --rm ${IMAGE_NAME} pwsh -c Get-Help"
32+
33+
RUN if [ "${LATEST}" = True ] ; then \
34+
# install latest azure-powershell from BLOB
35+
pwsh -Command Invoke-WebRequest -uri ${BLOB_URL} -OutFile latest.tar.gz && \
36+
mkdir latest && \
37+
tar -zxvf ./latest.tar.gz -C ./latest && \
38+
pwsh -Command ./latest/InstallModule.ps1 ;\
39+
else \
40+
# install old azure-powershell from PSGallery
41+
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Trusted && \
42+
pwsh -Command Install-Module -Name ${MODULE} -RequiredVersion ${VERSION} -Scope AllUsers -Repository ${REPOSITORY} && \
43+
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Untrusted ;\
44+
fi
45+
46+
# create AzureRmContextSettings.json before it was generated
47+
COPY ${CONFIG}/${AZURERM_CONTEXT_SETTINGS} ${AZURE}/${AZURERM_CONTEXT_SETTINGS}
48+
49+
CMD [ "pwsh" ]

‎docker/Dockerfile-ubuntu-18.04

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ARG AZURE=/root/.Azure
88
ARG VCS_REF="none"
99
ARG BUILD_DATE=
1010
ARG VERSION=
11+
ARG LATEST=
1112
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-ubuntu-18.04
1213

1314
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-ubuntu-18.04"
@@ -28,11 +29,19 @@ LABEL maintainer="Azure PowerShell Team <[email protected]>" \
2829
org.label-schema.docker.cmd.devel="docker run -it --rm -e 'DebugPreference=Continue' ${IMAGE_NAME} pwsh" \
2930
org.label-schema.docker.cmd.test="currently not available" \
3031
org.label-schema.docker.cmd.help="docker run --rm ${IMAGE_NAME} pwsh -c Get-Help"
31-
32-
# install azure-powershell from PSGallery
33-
RUN pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Trusted && \
34-
pwsh -Command Install-Module -Name ${MODULE} -RequiredVersion ${VERSION} -Scope AllUsers -Repository ${REPOSITORY} && \
35-
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Untrusted
32+
33+
RUN if [ "${LATEST}" = True ] ; then \
34+
# install latest azure-powershell from BLOB
35+
pwsh -Command Invoke-WebRequest -uri ${BLOB_URL} -OutFile latest.tar.gz && \
36+
mkdir latest && \
37+
tar -zxvf ./latest.tar.gz -C ./latest && \
38+
pwsh -Command ./latest/InstallModule.ps1 ;\
39+
else \
40+
# install old azure-powershell from PSGallery
41+
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Trusted && \
42+
pwsh -Command Install-Module -Name ${MODULE} -RequiredVersion ${VERSION} -Scope AllUsers -Repository ${REPOSITORY} && \
43+
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Untrusted ;\
44+
fi
3645

3746
# create AzureRmContextSettings.json before it was generated
3847
COPY ${CONFIG}/${AZURERM_CONTEXT_SETTINGS} ${AZURE}/${AZURERM_CONTEXT_SETTINGS}

‎docker/Dockerfile-ubuntu-20.04

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ARG AZURE=/root/.Azure
88
ARG VCS_REF="none"
99
ARG BUILD_DATE=
1010
ARG VERSION=
11+
ARG LATEST=
1112
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-ubuntu-20.04
1213

1314
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-ubuntu-20.04"
@@ -29,10 +30,18 @@ LABEL maintainer="Azure PowerShell Team <[email protected]>" \
2930
org.label-schema.docker.cmd.test="currently not available" \
3031
org.label-schema.docker.cmd.help="docker run --rm ${IMAGE_NAME} pwsh -c Get-Help"
3132

32-
# install azure-powershell from PSGallery
33-
RUN pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Trusted && \
34-
pwsh -Command Install-Module -Name ${MODULE} -RequiredVersion ${VERSION} -Scope AllUsers -Repository ${REPOSITORY} && \
35-
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Untrusted
33+
RUN if [ "${LATEST}" = True ] ; then \
34+
# install latest azure-powershell from BLOB
35+
pwsh -Command Invoke-WebRequest -uri ${BLOB_URL} -OutFile latest.tar.gz && \
36+
mkdir latest && \
37+
tar -zxvf ./latest.tar.gz -C ./latest && \
38+
pwsh -Command ./latest/InstallModule.ps1 ;\
39+
else \
40+
# install old azure-powershell from PSGallery
41+
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Trusted && \
42+
pwsh -Command Install-Module -Name ${MODULE} -RequiredVersion ${VERSION} -Scope AllUsers -Repository ${REPOSITORY} && \
43+
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Untrusted ;\
44+
fi
3645

3746
# create AzureRmContextSettings.json before it was generated
3847
COPY ${CONFIG}/${AZURERM_CONTEXT_SETTINGS} ${AZURE}/${AZURERM_CONTEXT_SETTINGS}

‎docker/Dockerfile-ubuntu-22.04

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
FROM mcr.microsoft.com/powershell:ubuntu-22.04
2+
3+
ARG REPOSITORY=PSGallery
4+
ARG MODULE=Az
5+
ARG CONFIG=config
6+
ARG AZURERM_CONTEXT_SETTINGS=AzureRmContextSettings.json
7+
ARG AZURE=/root/.Azure
8+
ARG VCS_REF="none"
9+
ARG BUILD_DATE=
10+
ARG VERSION=
11+
ARG LATEST=
12+
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-ubuntu-22.04
13+
14+
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-ubuntu-22.04"
15+
16+
LABEL maintainer="Azure PowerShell Team <[email protected]>" \
17+
readme.md="http://aka.ms/azpsdockerreadme" \
18+
description="This Dockerfile will install the latest release of Azure PowerShell." \
19+
org.label-schema.build-date=${BUILD_DATE} \
20+
org.label-schema.usage="http://aka.ms/azpsdocker" \
21+
org.label-schema.url="http://aka.ms/azpsdockerreadme" \
22+
org.label-schema.vcs-url="https://github.com/Azure/azure-powershell" \
23+
org.label-schema.name="azure powershell" \
24+
org.label-schema.vendor="Azure PowerShell" \
25+
org.label-schema.version=${VERSION} \
26+
org.label-schema.schema-version="1.0" \
27+
org.label-schema.vcs-ref=${VCS_REF} \
28+
org.label-schema.docker.cmd="docker run --rm ${IMAGE_NAME} pwsh -c '\$PSVERSIONTABLE'" \
29+
org.label-schema.docker.cmd.devel="docker run -it --rm -e 'DebugPreference=Continue' ${IMAGE_NAME} pwsh" \
30+
org.label-schema.docker.cmd.test="currently not available" \
31+
org.label-schema.docker.cmd.help="docker run --rm ${IMAGE_NAME} pwsh -c Get-Help"
32+
33+
RUN if [ "${LATEST}" = True ] ; then \
34+
# install latest azure-powershell from BLOB
35+
pwsh -Command Invoke-WebRequest -uri ${BLOB_URL} -OutFile latest.tar.gz && \
36+
mkdir latest && \
37+
tar -zxvf ./latest.tar.gz -C ./latest && \
38+
pwsh -Command ./latest/InstallModule.ps1 ;\
39+
else \
40+
# install old azure-powershell from PSGallery
41+
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Trusted && \
42+
pwsh -Command Install-Module -Name ${MODULE} -RequiredVersion ${VERSION} -Scope AllUsers -Repository ${REPOSITORY} && \
43+
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Untrusted ;\
44+
fi
45+
46+
47+
# create AzureRmContextSettings.json before it was generated
48+
COPY ${CONFIG}/${AZURERM_CONTEXT_SETTINGS} ${AZURE}/${AZURERM_CONTEXT_SETTINGS}
49+
50+
CMD [ "pwsh" ]

‎tools/Test/SmokeTest/RmCoreSmokeTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ $resourceTestCommands = @(
156156
@{Name = "Az.StorageSync"; Command = {Get-AzStorageSyncService}},
157157
@{Name = "Az.Support"; Command = {Get-AzSupportTicket}},
158158
@{Name = "Az.Resources [Tags]"; Command = {Get-AzTag}},
159-
@{Name = "Az.Resources [MSGraph]"; Command = {Get-AzAdGroup -First 1}},
159+
@{Name = "Az.Resources [MSGraph]"; Command = {Get-AzADUser -First 1 -Select Id}},
160160
@{Name = "Az.TrafficManager"; Command = {Get-AzTrafficManagerProfile}},
161161
@{Name = "Az.Billing [UsageAggregates]"; Command = {Get-UsageAggregates -ReportedStartTime '1/1/2018' -ReportedEndTime '1/2/2018'}},
162162
@{Name = "Az.Websites"; Command = {Get-AzWebApp -ResourceGroupName $resourceGroupName}}

0 commit comments

Comments
 (0)