Skip to content

Commit 0e1cec1

Browse files
authored
Revise docker file for mariner-2.0 (#18318)
* add docker file for mariner 2.0 * revise code issue * add blob_url parameter * revise mariner 2.0 dockerfile * revise mariner 2.0 dockerfile
1 parent cd71457 commit 0e1cec1

10 files changed

+62
-1
lines changed

docker/Dockerfile-alpine-3.13

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ARG VCS_REF="none"
99
ARG BUILD_DATE=
1010
ARG VERSION=
1111
ARG LATEST=
12+
ARG BLOB_URL=
1213
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-alpine-3.13
1314

1415
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-alpine-3.13"

docker/Dockerfile-alpine-3.14

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ARG VCS_REF="none"
99
ARG BUILD_DATE=
1010
ARG VERSION=
1111
ARG LATEST=
12+
ARG BLOB_URL=
1213
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-alpine-3.14
1314

1415
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-alpine-3.14"

docker/Dockerfile-centos-7

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ARG VCS_REF="none"
99
ARG BUILD_DATE=
1010
ARG VERSION=
1111
ARG LATEST=
12+
ARG BLOB_URL=
1213
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-centos-7
1314

1415
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-centos-7"

docker/Dockerfile-debian-10

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ARG VCS_REF="none"
99
ARG BUILD_DATE=
1010
ARG VERSION=
1111
ARG LATEST=
12+
ARG BLOB_URL=
1213
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-debian-10
1314

1415
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-debian-10"

docker/Dockerfile-debian-11

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ARG VCS_REF="none"
99
ARG BUILD_DATE=
1010
ARG VERSION=
1111
ARG LATEST=
12+
ARG BLOB_URL=
1213
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-debian-11
1314

1415
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-debian-11"

docker/Dockerfile-mariner-1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/powershell:preview-mariner-1.0
1+
FROM mcr.microsoft.com/powershell:mariner-1.0
22

33
ARG REPOSITORY=PSGallery
44
ARG MODULE=Az
@@ -9,6 +9,7 @@ ARG VCS_REF="none"
99
ARG BUILD_DATE=
1010
ARG VERSION=
1111
ARG LATEST=
12+
ARG BLOB_URL=
1213
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-mariner-1.0
1314

1415
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-mariner-1.0"

docker/Dockerfile-mariner-2

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

docker/Dockerfile-ubuntu-18.04

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ARG VCS_REF="none"
99
ARG BUILD_DATE=
1010
ARG VERSION=
1111
ARG LATEST=
12+
ARG BLOB_URL=
1213
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-ubuntu-18.04
1314

1415
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-ubuntu-18.04"

docker/Dockerfile-ubuntu-20.04

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ARG VCS_REF="none"
99
ARG BUILD_DATE=
1010
ARG VERSION=
1111
ARG LATEST=
12+
ARG BLOB_URL=
1213
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-ubuntu-20.04
1314

1415
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-ubuntu-20.04"

docker/Dockerfile-ubuntu-22.04

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ARG VCS_REF="none"
99
ARG BUILD_DATE=
1010
ARG VERSION=
1111
ARG LATEST=
12+
ARG BLOB_URL=
1213
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-ubuntu-22.04
1314

1415
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-ubuntu-22.04"

0 commit comments

Comments
 (0)