From e1aba08372442a056a027e5e4d47385922f2e27f Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Tue, 2 Jun 2020 12:40:42 -0400 Subject: [PATCH] Finish off the labels (#440) --- docs/development.md | 41 +------------------ .../amazonlinux/docker/Dockerfile | 17 -------- .../amazonlinux/test-deps/docker/Dockerfile | 22 ---------- .../archlinux/docker/Dockerfile | 17 -------- .../blackarch/docker/Dockerfile | 21 ---------- .../clearlinux/docker/Dockerfile | 17 -------- .../kalilinux/docker/Dockerfile | 17 -------- .../oraclelinux/docker/Dockerfile | 17 -------- .../parrotsec/docker/Dockerfile | 17 -------- .../community-stable/photon/docker/Dockerfile | 17 -------- release/lts/alpine38/docker/Dockerfile | 18 -------- .../lts/alpine38/test-deps/docker/Dockerfile | 22 +--------- release/lts/alpine39/docker/Dockerfile | 18 -------- .../lts/alpine39/test-deps/docker/Dockerfile | 22 +--------- release/lts/arm32v7/docker/Dockerfile | 16 -------- release/lts/centos7/docker/Dockerfile | 16 -------- .../lts/centos7/test-deps/docker/Dockerfile | 21 ---------- release/lts/centos8/docker/Dockerfile | 16 -------- .../lts/centos8/test-deps/docker/Dockerfile | 21 ---------- release/lts/debian10/docker/Dockerfile | 16 -------- .../lts/debian10/test-deps/docker/Dockerfile | 21 ---------- release/lts/debian11/docker/Dockerfile | 16 -------- .../lts/debian11/test-deps/docker/Dockerfile | 21 ---------- release/lts/debian9/docker/Dockerfile | 16 -------- .../lts/debian9/test-deps/docker/Dockerfile | 21 ---------- release/lts/fedora/docker/Dockerfile | 16 -------- .../lts/fedora/test-deps/docker/Dockerfile | 21 ---------- release/lts/nanoserver1809/docker/Dockerfile | 14 ------- release/lts/ubuntu16.04/docker/Dockerfile | 16 -------- .../ubuntu16.04/test-deps/docker/Dockerfile | 21 ---------- release/lts/ubuntu18.04/docker/Dockerfile | 16 -------- .../ubuntu18.04/test-deps/docker/Dockerfile | 21 ---------- .../lts/windowsservercore/docker/Dockerfile | 16 -------- release/preview/alpine311/docker/Dockerfile | 18 -------- .../alpine311/test-deps/docker/Dockerfile | 22 +--------- release/preview/alpine38/docker/Dockerfile | 18 -------- .../alpine38/test-deps/docker/Dockerfile | 22 +--------- release/preview/alpine39/docker/Dockerfile | 18 -------- .../alpine39/test-deps/docker/Dockerfile | 22 +--------- release/preview/arm32v7/docker/Dockerfile | 16 -------- release/preview/centos7/docker/Dockerfile | 16 -------- .../centos7/test-deps/docker/Dockerfile | 21 ---------- release/preview/centos8/docker/Dockerfile | 16 -------- .../centos8/test-deps/docker/Dockerfile | 21 ---------- release/preview/debian10/docker/Dockerfile | 16 -------- .../debian10/test-deps/docker/Dockerfile | 21 ---------- release/preview/debian11/docker/Dockerfile | 16 -------- .../debian11/test-deps/docker/Dockerfile | 21 ---------- release/preview/debian9/docker/Dockerfile | 16 -------- .../debian9/test-deps/docker/Dockerfile | 21 ---------- release/preview/fedora/docker/Dockerfile | 16 -------- .../fedora/test-deps/docker/Dockerfile | 21 ---------- .../preview/nanoserver1809/docker/Dockerfile | 14 ------- release/preview/ubuntu16.04/docker/Dockerfile | 16 -------- .../ubuntu16.04/test-deps/docker/Dockerfile | 21 ---------- release/preview/ubuntu18.04/docker/Dockerfile | 16 -------- .../ubuntu18.04/test-deps/docker/Dockerfile | 21 ---------- release/preview/ubuntu20.04/docker/Dockerfile | 16 -------- .../ubuntu20.04/test-deps/docker/Dockerfile | 21 ---------- .../windowsservercore/docker/Dockerfile | 16 -------- release/servicing/alpine/docker/Dockerfile | 18 -------- release/servicing/centos7/docker/Dockerfile | 16 -------- release/servicing/debian9/docker/Dockerfile | 16 -------- .../nanoserver1809/docker/Dockerfile | 16 -------- .../servicing/opensuse423/docker/Dockerfile | 18 -------- .../servicing/ubuntu16.04/docker/Dockerfile | 16 -------- .../servicing/ubuntu18.04/docker/Dockerfile | 16 -------- .../windowsservercore/docker/Dockerfile | 16 -------- release/stable/alpine38/docker/Dockerfile | 18 -------- .../alpine38/test-deps/docker/Dockerfile | 22 +--------- release/stable/alpine39/docker/Dockerfile | 18 -------- .../alpine39/test-deps/docker/Dockerfile | 22 +--------- release/stable/arm32v7/docker/Dockerfile | 16 -------- release/stable/centos7/docker/Dockerfile | 16 -------- .../centos7/test-deps/docker/Dockerfile | 20 --------- release/stable/centos8/docker/Dockerfile | 16 -------- .../centos8/test-deps/docker/Dockerfile | 21 ---------- release/stable/debian10/docker/Dockerfile | 16 -------- .../debian10/test-deps/docker/Dockerfile | 21 ---------- release/stable/debian11/docker/Dockerfile | 16 -------- .../debian11/test-deps/docker/Dockerfile | 21 ---------- release/stable/debian9/docker/Dockerfile | 16 -------- .../debian9/test-deps/docker/Dockerfile | 21 ---------- release/stable/fedora/docker/Dockerfile | 16 -------- .../stable/fedora/test-deps/docker/Dockerfile | 21 ---------- .../stable/nanoserver1809/docker/Dockerfile | 16 -------- release/stable/ubuntu16.04/docker/Dockerfile | 16 -------- .../ubuntu16.04/test-deps/docker/Dockerfile | 21 ---------- release/stable/ubuntu18.04/docker/Dockerfile | 16 -------- .../ubuntu18.04/test-deps/docker/Dockerfile | 21 ---------- .../windowsservercore/docker/Dockerfile | 16 -------- tools/buildHelper/buildHelper.psm1 | 2 - 92 files changed, 8 insertions(+), 1673 deletions(-) diff --git a/docs/development.md b/docs/development.md index 717d9099e..90aacad5a 100644 --- a/docs/development.md +++ b/docs/development.md @@ -113,34 +113,6 @@ ARG PS_VERSION=6.0.4 ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu16.04 ``` -* A `VCS_REF` argument should be defined, and used wherever the `git` commit hash is needed. - - For example: - -```dockerfile -ARG VCS_REF="none" -``` - -* The following labels should be applied to all images: - -```dockerfile -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" -``` - ## Testing You should not have to write any specific tests for your image, @@ -150,18 +122,7 @@ The CI definition is here at `vsts-ci.yml`. ### Template -Here is a template for an image build job: - -```yaml -- template: .vsts-ci/phase.yml - parameters: - name: insertImageNameHere - imagename: insertImageNameHere - stable: false - preview: false - communityStable: true - continueonerror: false -``` +TODO: Update this ## Tags diff --git a/release/community-stable/amazonlinux/docker/Dockerfile b/release/community-stable/amazonlinux/docker/Dockerfile index f759f7582..2b09e4e0e 100644 --- a/release/community-stable/amazonlinux/docker/Dockerfile +++ b/release/community-stable/amazonlinux/docker/Dockerfile @@ -64,21 +64,4 @@ RUN \ # remove cache folders and files && rm -rf /var/cache/yum -# Define args needed only for the labels -ARG IMAGE_NAME=pshorg/powershellcommunity:amazonlinux-2.0.20181114 -ARG VCS_REF="none" - -# Add label last as it's just metadata and uses a lot of parameters -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" - CMD [ "pwsh" ] diff --git a/release/community-stable/amazonlinux/test-deps/docker/Dockerfile b/release/community-stable/amazonlinux/test-deps/docker/Dockerfile index e1996daef..ce69ec819 100644 --- a/release/community-stable/amazonlinux/test-deps/docker/Dockerfile +++ b/release/community-stable/amazonlinux/test-deps/docker/Dockerfile @@ -30,28 +30,6 @@ RUN \ # remove cache folders and files && rm -rf /var/cache/yum -# Define args needed only for the labels -ARG IMAGE_NAME=pshorg/powershellcommunity/test-deps:amazonlinux-2.0.20181114 -ARG VCS_REF="none" -ARG PS_VERSION=6.1.0 - ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-AmazonLinux-${fromTag} -# Add label last as it's just metadata and uses a lot of parameters -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - CMD [ "pwsh" ] diff --git a/release/community-stable/archlinux/docker/Dockerfile b/release/community-stable/archlinux/docker/Dockerfile index 98a047ecf..56ce053cc 100644 --- a/release/community-stable/archlinux/docker/Dockerfile +++ b/release/community-stable/archlinux/docker/Dockerfile @@ -110,21 +110,4 @@ RUN \ # clean downloaded packages && yes | pacman -Scc -# Define args needed only for the labels -ARG IMAGE_NAME=pshorg/powershellcommunity:archlinux-latest -ARG VCS_REF="none" - -# Add label last as it's just metadata and uses a lot of parameters -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" - CMD [ "pwsh" ] diff --git a/release/community-stable/blackarch/docker/Dockerfile b/release/community-stable/blackarch/docker/Dockerfile index 63255394f..8bf42d49d 100644 --- a/release/community-stable/blackarch/docker/Dockerfile +++ b/release/community-stable/blackarch/docker/Dockerfile @@ -125,25 +125,4 @@ RUN \ # clean downloaded packages && yes | pacman -Scc -# Define args needed only for the labels -ARG IMAGE_NAME=pshorg/powershellcommunity:blackarch-latest -ARG VCS_REF="none" - -# Add label last as it's just metadata and uses a lot of parameters -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - CMD [ "pwsh" ] diff --git a/release/community-stable/clearlinux/docker/Dockerfile b/release/community-stable/clearlinux/docker/Dockerfile index d99305461..aeeaba615 100644 --- a/release/community-stable/clearlinux/docker/Dockerfile +++ b/release/community-stable/clearlinux/docker/Dockerfile @@ -55,21 +55,4 @@ RUN \ # clean downloaded packages && swupd clean --all -# Define args needed only for the labels -ARG IMAGE_NAME=pshorg/powershellcommunity:clearlinux-latest -ARG VCS_REF="none" - -# Add label last as it's just metadata and uses a lot of parameters -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" - CMD [ "pwsh" ] diff --git a/release/community-stable/kalilinux/docker/Dockerfile b/release/community-stable/kalilinux/docker/Dockerfile index 92c4a7195..ee6bfd250 100644 --- a/release/community-stable/kalilinux/docker/Dockerfile +++ b/release/community-stable/kalilinux/docker/Dockerfile @@ -74,21 +74,4 @@ RUN \ # remove package list && rm -rf /var/lib/apt/lists/* -# Define args needed only for the labels -ARG IMAGE_NAME=pshorg/powershellcommunity:kalilinux -ARG VCS_REF="none" - -# Add label last as it's just metadata and uses a lot of parameters -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" - CMD [ "pwsh" ] diff --git a/release/community-stable/oraclelinux/docker/Dockerfile b/release/community-stable/oraclelinux/docker/Dockerfile index 8ce92a536..0846241ea 100644 --- a/release/community-stable/oraclelinux/docker/Dockerfile +++ b/release/community-stable/oraclelinux/docker/Dockerfile @@ -64,21 +64,4 @@ RUN \ # remove cache folders and files && rm -rf /var/cache/yum -# Define args needed only for the labels -ARG IMAGE_NAME=pshorg/powershellcommunity:oraclelinux-7.5 -ARG VCS_REF="none" - -# Add label last as it's just metadata and uses a lot of parameters -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" - CMD [ "pwsh" ] diff --git a/release/community-stable/parrotsec/docker/Dockerfile b/release/community-stable/parrotsec/docker/Dockerfile index f4f42f8c8..4ff421ef3 100644 --- a/release/community-stable/parrotsec/docker/Dockerfile +++ b/release/community-stable/parrotsec/docker/Dockerfile @@ -77,21 +77,4 @@ RUN \ # remove package list && rm -rf /var/lib/apt/lists/* -# Define args needed only for the labels -ARG IMAGE_NAME=pshorg/powershellcommunity:parrotsec-latest -ARG VCS_REF="none" - -# Add label last as it's just metadata and uses a lot of parameters -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" - CMD [ "pwsh" ] diff --git a/release/community-stable/photon/docker/Dockerfile b/release/community-stable/photon/docker/Dockerfile index a3c888394..a027dab11 100644 --- a/release/community-stable/photon/docker/Dockerfile +++ b/release/community-stable/photon/docker/Dockerfile @@ -98,21 +98,4 @@ RUN \ # clean cached data && tdnf clean all -# Define args needed only for the labels -ARG IMAGE_NAME=pshorg/powershellcommunity:photon-2.0 -ARG VCS_REF="none" - -# Add label last as it's just metadata and uses a lot of parameters -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" - CMD [ "pwsh" ] diff --git a/release/lts/alpine38/docker/Dockerfile b/release/lts/alpine38/docker/Dockerfile index 2ff0b06e3..d2863bb65 100644 --- a/release/lts/alpine38/docker/Dockerfile +++ b/release/lts/alpine38/docker/Dockerfile @@ -85,22 +85,4 @@ RUN apk add --no-cache \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG PS_VERSION=6.2.0 -ARG IMAGE_NAME=mcr.microsoft.com/powershell:alpine-3.8 -ARG VCS_REF="none" - -# Add label last as it's just metadata and uses a lot of parameters -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" - CMD [ "pwsh" ] diff --git a/release/lts/alpine38/test-deps/docker/Dockerfile b/release/lts/alpine38/test-deps/docker/Dockerfile index df83e1f54..3d41fcfca 100644 --- a/release/lts/alpine38/test-deps/docker/Dockerfile +++ b/release/lts/alpine38/test-deps/docker/Dockerfile @@ -31,27 +31,7 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.8 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" \ - com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node" +LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node" # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c diff --git a/release/lts/alpine39/docker/Dockerfile b/release/lts/alpine39/docker/Dockerfile index f5a738262..406350acf 100644 --- a/release/lts/alpine39/docker/Dockerfile +++ b/release/lts/alpine39/docker/Dockerfile @@ -87,22 +87,4 @@ RUN apk add --no-cache \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG PS_VERSION=7.0.0 -ARG IMAGE_NAME=mcr.microsoft.com/powershell:alpine-3.8 -ARG VCS_REF="none" - -# Add label last as it's just metadata and uses a lot of parameters -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" - CMD [ "pwsh" ] diff --git a/release/lts/alpine39/test-deps/docker/Dockerfile b/release/lts/alpine39/test-deps/docker/Dockerfile index b6bd3bf89..1fb8267a4 100644 --- a/release/lts/alpine39/test-deps/docker/Dockerfile +++ b/release/lts/alpine39/test-deps/docker/Dockerfile @@ -33,27 +33,7 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.8 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" \ - com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node" +LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node" # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c diff --git a/release/lts/arm32v7/docker/Dockerfile b/release/lts/arm32v7/docker/Dockerfile index 8e5617eea..bc792dd67 100644 --- a/release/lts/arm32v7/docker/Dockerfile +++ b/release/lts/arm32v7/docker/Dockerfile @@ -70,22 +70,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \ # Create the pwsh-lts symbolic link that points to powershell && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-lts -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:arm32v7-ubuntu-bionic - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/lts/centos7/docker/Dockerfile b/release/lts/centos7/docker/Dockerfile index c0fee6b29..cd668d6ea 100644 --- a/release/lts/centos7/docker/Dockerfile +++ b/release/lts/centos7/docker/Dockerfile @@ -49,22 +49,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:centos-7 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/lts/centos7/test-deps/docker/Dockerfile b/release/lts/centos7/test-deps/docker/Dockerfile index 5b9e2fc53..b41a2cefd 100644 --- a/release/lts/centos7/test-deps/docker/Dockerfile +++ b/release/lts/centos7/test-deps/docker/Dockerfile @@ -13,27 +13,6 @@ RUN yum install -y \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos-7 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/lts/centos8/docker/Dockerfile b/release/lts/centos8/docker/Dockerfile index 48861e1dd..bf733cce1 100644 --- a/release/lts/centos8/docker/Dockerfile +++ b/release/lts/centos8/docker/Dockerfile @@ -50,22 +50,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:centos-7 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/lts/centos8/test-deps/docker/Dockerfile b/release/lts/centos8/test-deps/docker/Dockerfile index 5b9e2fc53..b41a2cefd 100644 --- a/release/lts/centos8/test-deps/docker/Dockerfile +++ b/release/lts/centos8/test-deps/docker/Dockerfile @@ -13,27 +13,6 @@ RUN yum install -y \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos-7 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/lts/debian10/docker/Dockerfile b/release/lts/debian10/docker/Dockerfile index 27ddcc83e..abb24b745 100644 --- a/release/lts/debian10/docker/Dockerfile +++ b/release/lts/debian10/docker/Dockerfile @@ -87,22 +87,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-10 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/lts/debian10/test-deps/docker/Dockerfile b/release/lts/debian10/test-deps/docker/Dockerfile index d5b3a47d1..63bec0248 100644 --- a/release/lts/debian10/test-deps/docker/Dockerfile +++ b/release/lts/debian10/test-deps/docker/Dockerfile @@ -17,27 +17,6 @@ RUN apt-get update \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-10 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-9 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/lts/debian11/docker/Dockerfile b/release/lts/debian11/docker/Dockerfile index 0262aad62..508a95030 100644 --- a/release/lts/debian11/docker/Dockerfile +++ b/release/lts/debian11/docker/Dockerfile @@ -87,22 +87,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-11 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/lts/debian11/test-deps/docker/Dockerfile b/release/lts/debian11/test-deps/docker/Dockerfile index 1f3e4563a..96a8b9a38 100644 --- a/release/lts/debian11/test-deps/docker/Dockerfile +++ b/release/lts/debian11/test-deps/docker/Dockerfile @@ -17,27 +17,6 @@ RUN apt-get update \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-11 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-11 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/lts/debian9/docker/Dockerfile b/release/lts/debian9/docker/Dockerfile index cf39d2dd1..a1f2bf4ae 100644 --- a/release/lts/debian9/docker/Dockerfile +++ b/release/lts/debian9/docker/Dockerfile @@ -53,22 +53,6 @@ RUN apt-get update \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-9 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/lts/debian9/test-deps/docker/Dockerfile b/release/lts/debian9/test-deps/docker/Dockerfile index 0abc4fc86..0691eac7d 100644 --- a/release/lts/debian9/test-deps/docker/Dockerfile +++ b/release/lts/debian9/test-deps/docker/Dockerfile @@ -17,27 +17,6 @@ RUN apt-get update \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-9 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-9 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/lts/fedora/docker/Dockerfile b/release/lts/fedora/docker/Dockerfile index d50997dd5..db5eb26a1 100644 --- a/release/lts/fedora/docker/Dockerfile +++ b/release/lts/fedora/docker/Dockerfile @@ -85,22 +85,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:fedora28 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/lts/fedora/test-deps/docker/Dockerfile b/release/lts/fedora/test-deps/docker/Dockerfile index e0004d29a..656afd0ff 100644 --- a/release/lts/fedora/test-deps/docker/Dockerfile +++ b/release/lts/fedora/test-deps/docker/Dockerfile @@ -17,27 +17,6 @@ RUN dnf install -y \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-${fromTag} -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:fedora-28 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/lts/nanoserver1809/docker/Dockerfile b/release/lts/nanoserver1809/docker/Dockerfile index fae758657..94dc98404 100755 --- a/release/lts/nanoserver1809/docker/Dockerfile +++ b/release/lts/nanoserver1809/docker/Dockerfile @@ -41,8 +41,6 @@ FROM ${NanoServerRepo}:${fromTag} ARG fromTag=1709 -ARG VCS_REF="none" -ARG PS_VERSION=6.2.0-rc.1 ARG IMAGE_NAME=mcr.microsoft.com/powershell # Copy PowerShell Core from the installer container @@ -86,16 +84,4 @@ RUN pwsh ` Start-Sleep -Seconds 6 ; ` }" -LABEL maintainer="PowerShell Team " ` - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" ` - description="This Dockerfile will install the latest release of PowerShell." ` - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" ` - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" ` - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" ` - org.label-schema.name="powershell" ` - org.label-schema.vcs-ref=${VCS_REF} ` - org.label-schema.vendor="PowerShell" ` - org.label-schema.version=${PS_VERSION} ` - org.label-schema.schema-version="1.0" - CMD ["pwsh.exe"] diff --git a/release/lts/ubuntu16.04/docker/Dockerfile b/release/lts/ubuntu16.04/docker/Dockerfile index 68334eaaa..69a8dd15a 100644 --- a/release/lts/ubuntu16.04/docker/Dockerfile +++ b/release/lts/ubuntu16.04/docker/Dockerfile @@ -50,22 +50,6 @@ RUN apt-get update \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu16.04 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/lts/ubuntu16.04/test-deps/docker/Dockerfile b/release/lts/ubuntu16.04/test-deps/docker/Dockerfile index c08a6a6f5..6e8192a52 100644 --- a/release/lts/ubuntu16.04/test-deps/docker/Dockerfile +++ b/release/lts/ubuntu16.04/test-deps/docker/Dockerfile @@ -16,27 +16,6 @@ RUN apt-get update \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-16.04 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-16.04 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/lts/ubuntu18.04/docker/Dockerfile b/release/lts/ubuntu18.04/docker/Dockerfile index 1d79f2b67..65d0b739e 100644 --- a/release/lts/ubuntu18.04/docker/Dockerfile +++ b/release/lts/ubuntu18.04/docker/Dockerfile @@ -50,22 +50,6 @@ RUN apt-get update \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu18.04 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/lts/ubuntu18.04/test-deps/docker/Dockerfile b/release/lts/ubuntu18.04/test-deps/docker/Dockerfile index ddfb6930c..47e76069d 100644 --- a/release/lts/ubuntu18.04/test-deps/docker/Dockerfile +++ b/release/lts/ubuntu18.04/test-deps/docker/Dockerfile @@ -16,27 +16,6 @@ RUN apt-get update \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-18.04 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-18.04 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/lts/windowsservercore/docker/Dockerfile b/release/lts/windowsservercore/docker/Dockerfile index f041525ef..4406d4f96 100755 --- a/release/lts/windowsservercore/docker/Dockerfile +++ b/release/lts/windowsservercore/docker/Dockerfile @@ -63,19 +63,3 @@ RUN pwsh ` }" CMD ["pwsh.exe"] - -ARG IMAGE_NAME=mcr.microsoft.com/powershell:windowsservercore -ARG VCS_REF="none" -ARG PS_VERSION=7.0.0 - -LABEL maintainer="PowerShell Team " ` - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" ` - description="This Dockerfile will install the latest release of PowerShell." ` - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" ` - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" ` - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" ` - org.label-schema.name="powershell" ` - org.label-schema.vendor="PowerShell" ` - org.label-schema.vcs-ref=${VCS_REF} ` - org.label-schema.version=${PS_VERSION} ` - org.label-schema.schema-version="1.0" diff --git a/release/preview/alpine311/docker/Dockerfile b/release/preview/alpine311/docker/Dockerfile index f3f50b248..86880a965 100644 --- a/release/preview/alpine311/docker/Dockerfile +++ b/release/preview/alpine311/docker/Dockerfile @@ -87,22 +87,4 @@ RUN apk add --no-cache \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG PS_VERSION=7.0.0-preview.1 -ARG IMAGE_NAME=mcr.microsoft.com/powershell:preview-alpine-3.11 -ARG VCS_REF="none" - -# Add label last as it's just metadata and uses a lot of parameters -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" - CMD [ "pwsh" ] diff --git a/release/preview/alpine311/test-deps/docker/Dockerfile b/release/preview/alpine311/test-deps/docker/Dockerfile index 0ecc05f6a..af97ac304 100644 --- a/release/preview/alpine311/test-deps/docker/Dockerfile +++ b/release/preview/alpine311/test-deps/docker/Dockerfile @@ -33,27 +33,7 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.11 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" \ - com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node" +LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node" # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c diff --git a/release/preview/alpine38/docker/Dockerfile b/release/preview/alpine38/docker/Dockerfile index c7084b156..681a92b14 100644 --- a/release/preview/alpine38/docker/Dockerfile +++ b/release/preview/alpine38/docker/Dockerfile @@ -85,22 +85,4 @@ RUN apk add --no-cache \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG PS_VERSION=6.2.0-preview.2 -ARG IMAGE_NAME=mcr.microsoft.com/powershell:preview-alpine-3.8 -ARG VCS_REF="none" - -# Add label last as it's just metadata and uses a lot of parameters -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" - CMD [ "pwsh" ] diff --git a/release/preview/alpine38/test-deps/docker/Dockerfile b/release/preview/alpine38/test-deps/docker/Dockerfile index 4b38aafe0..83f43feb9 100644 --- a/release/preview/alpine38/test-deps/docker/Dockerfile +++ b/release/preview/alpine38/test-deps/docker/Dockerfile @@ -31,27 +31,7 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.8 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" \ - com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node" +LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node" # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c diff --git a/release/preview/alpine39/docker/Dockerfile b/release/preview/alpine39/docker/Dockerfile index 24d50b10b..827bfc462 100644 --- a/release/preview/alpine39/docker/Dockerfile +++ b/release/preview/alpine39/docker/Dockerfile @@ -87,22 +87,4 @@ RUN apk add --no-cache \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG PS_VERSION=6.2.0-preview.2 -ARG IMAGE_NAME=mcr.microsoft.com/powershell:preview-alpine-3.8 -ARG VCS_REF="none" - -# Add label last as it's just metadata and uses a lot of parameters -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" - CMD [ "pwsh" ] diff --git a/release/preview/alpine39/test-deps/docker/Dockerfile b/release/preview/alpine39/test-deps/docker/Dockerfile index b6bd3bf89..1fb8267a4 100644 --- a/release/preview/alpine39/test-deps/docker/Dockerfile +++ b/release/preview/alpine39/test-deps/docker/Dockerfile @@ -33,27 +33,7 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.8 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" \ - com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node" +LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node" # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c diff --git a/release/preview/arm32v7/docker/Dockerfile b/release/preview/arm32v7/docker/Dockerfile index 84a707c87..229e11ffb 100644 --- a/release/preview/arm32v7/docker/Dockerfile +++ b/release/preview/arm32v7/docker/Dockerfile @@ -70,22 +70,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \ # Create the pwsh-preview symbolic link that points to powershell && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:preview-arm32v7-ubuntu-bionic - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/preview/centos7/docker/Dockerfile b/release/preview/centos7/docker/Dockerfile index 35ecd31d1..b6004302e 100644 --- a/release/preview/centos7/docker/Dockerfile +++ b/release/preview/centos7/docker/Dockerfile @@ -50,22 +50,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:centos-7 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh-preview" ] diff --git a/release/preview/centos7/test-deps/docker/Dockerfile b/release/preview/centos7/test-deps/docker/Dockerfile index 5b9e2fc53..b41a2cefd 100644 --- a/release/preview/centos7/test-deps/docker/Dockerfile +++ b/release/preview/centos7/test-deps/docker/Dockerfile @@ -13,27 +13,6 @@ RUN yum install -y \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos-7 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/preview/centos8/docker/Dockerfile b/release/preview/centos8/docker/Dockerfile index 8af45b6c1..fbb4b358d 100644 --- a/release/preview/centos8/docker/Dockerfile +++ b/release/preview/centos8/docker/Dockerfile @@ -51,22 +51,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:centos-7 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh-preview" ] diff --git a/release/preview/centos8/test-deps/docker/Dockerfile b/release/preview/centos8/test-deps/docker/Dockerfile index 5b9e2fc53..b41a2cefd 100644 --- a/release/preview/centos8/test-deps/docker/Dockerfile +++ b/release/preview/centos8/test-deps/docker/Dockerfile @@ -13,27 +13,6 @@ RUN yum install -y \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos-7 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/preview/debian10/docker/Dockerfile b/release/preview/debian10/docker/Dockerfile index 0de8f4e29..20f860b50 100644 --- a/release/preview/debian10/docker/Dockerfile +++ b/release/preview/debian10/docker/Dockerfile @@ -85,22 +85,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-10 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/preview/debian10/test-deps/docker/Dockerfile b/release/preview/debian10/test-deps/docker/Dockerfile index 2de4090e9..614166526 100644 --- a/release/preview/debian10/test-deps/docker/Dockerfile +++ b/release/preview/debian10/test-deps/docker/Dockerfile @@ -17,27 +17,6 @@ RUN apt-get update \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-10 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-9 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/preview/debian11/docker/Dockerfile b/release/preview/debian11/docker/Dockerfile index ca606c930..f8a4b3162 100644 --- a/release/preview/debian11/docker/Dockerfile +++ b/release/preview/debian11/docker/Dockerfile @@ -85,22 +85,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-11 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/preview/debian11/test-deps/docker/Dockerfile b/release/preview/debian11/test-deps/docker/Dockerfile index be48d665f..e3ee94ddc 100644 --- a/release/preview/debian11/test-deps/docker/Dockerfile +++ b/release/preview/debian11/test-deps/docker/Dockerfile @@ -17,27 +17,6 @@ RUN apt-get update \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-11 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-11 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/preview/debian9/docker/Dockerfile b/release/preview/debian9/docker/Dockerfile index 85c94534f..a5c3553ac 100644 --- a/release/preview/debian9/docker/Dockerfile +++ b/release/preview/debian9/docker/Dockerfile @@ -54,22 +54,6 @@ RUN apt-get update \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-9 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/preview/debian9/test-deps/docker/Dockerfile b/release/preview/debian9/test-deps/docker/Dockerfile index fa8e1abc8..7ab3f2e17 100644 --- a/release/preview/debian9/test-deps/docker/Dockerfile +++ b/release/preview/debian9/test-deps/docker/Dockerfile @@ -17,27 +17,6 @@ RUN apt-get update \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-9 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-9 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/preview/fedora/docker/Dockerfile b/release/preview/fedora/docker/Dockerfile index a215f2431..91edc1c55 100644 --- a/release/preview/fedora/docker/Dockerfile +++ b/release/preview/fedora/docker/Dockerfile @@ -86,22 +86,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:fedora28 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh-preview" ] diff --git a/release/preview/fedora/test-deps/docker/Dockerfile b/release/preview/fedora/test-deps/docker/Dockerfile index e0004d29a..656afd0ff 100644 --- a/release/preview/fedora/test-deps/docker/Dockerfile +++ b/release/preview/fedora/test-deps/docker/Dockerfile @@ -17,27 +17,6 @@ RUN dnf install -y \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-${fromTag} -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:fedora-28 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/preview/nanoserver1809/docker/Dockerfile b/release/preview/nanoserver1809/docker/Dockerfile index fae758657..94dc98404 100755 --- a/release/preview/nanoserver1809/docker/Dockerfile +++ b/release/preview/nanoserver1809/docker/Dockerfile @@ -41,8 +41,6 @@ FROM ${NanoServerRepo}:${fromTag} ARG fromTag=1709 -ARG VCS_REF="none" -ARG PS_VERSION=6.2.0-rc.1 ARG IMAGE_NAME=mcr.microsoft.com/powershell # Copy PowerShell Core from the installer container @@ -86,16 +84,4 @@ RUN pwsh ` Start-Sleep -Seconds 6 ; ` }" -LABEL maintainer="PowerShell Team " ` - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" ` - description="This Dockerfile will install the latest release of PowerShell." ` - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" ` - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" ` - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" ` - org.label-schema.name="powershell" ` - org.label-schema.vcs-ref=${VCS_REF} ` - org.label-schema.vendor="PowerShell" ` - org.label-schema.version=${PS_VERSION} ` - org.label-schema.schema-version="1.0" - CMD ["pwsh.exe"] diff --git a/release/preview/ubuntu16.04/docker/Dockerfile b/release/preview/ubuntu16.04/docker/Dockerfile index 99724903e..727a54d57 100644 --- a/release/preview/ubuntu16.04/docker/Dockerfile +++ b/release/preview/ubuntu16.04/docker/Dockerfile @@ -51,22 +51,6 @@ RUN apt-get update \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu16.04 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh-preview" ] diff --git a/release/preview/ubuntu16.04/test-deps/docker/Dockerfile b/release/preview/ubuntu16.04/test-deps/docker/Dockerfile index 729657f20..09481ed6f 100644 --- a/release/preview/ubuntu16.04/test-deps/docker/Dockerfile +++ b/release/preview/ubuntu16.04/test-deps/docker/Dockerfile @@ -16,27 +16,6 @@ RUN apt-get update \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-16.04 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-16.04 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/preview/ubuntu18.04/docker/Dockerfile b/release/preview/ubuntu18.04/docker/Dockerfile index dc3bd006c..9f3db9364 100644 --- a/release/preview/ubuntu18.04/docker/Dockerfile +++ b/release/preview/ubuntu18.04/docker/Dockerfile @@ -51,22 +51,6 @@ RUN apt-get update \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu18.04 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh-preview" ] diff --git a/release/preview/ubuntu18.04/test-deps/docker/Dockerfile b/release/preview/ubuntu18.04/test-deps/docker/Dockerfile index ddfb6930c..47e76069d 100644 --- a/release/preview/ubuntu18.04/test-deps/docker/Dockerfile +++ b/release/preview/ubuntu18.04/test-deps/docker/Dockerfile @@ -16,27 +16,6 @@ RUN apt-get update \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-18.04 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-18.04 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/preview/ubuntu20.04/docker/Dockerfile b/release/preview/ubuntu20.04/docker/Dockerfile index caf9d7603..f139fa96b 100644 --- a/release/preview/ubuntu20.04/docker/Dockerfile +++ b/release/preview/ubuntu20.04/docker/Dockerfile @@ -82,22 +82,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu18.04 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh-preview" ] diff --git a/release/preview/ubuntu20.04/test-deps/docker/Dockerfile b/release/preview/ubuntu20.04/test-deps/docker/Dockerfile index bbe1bb8c5..d9c7795a7 100644 --- a/release/preview/ubuntu20.04/test-deps/docker/Dockerfile +++ b/release/preview/ubuntu20.04/test-deps/docker/Dockerfile @@ -16,27 +16,6 @@ RUN apt-get update \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-20.04 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-20.04 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/preview/windowsservercore/docker/Dockerfile b/release/preview/windowsservercore/docker/Dockerfile index 75a2b4743..b2e9274d6 100755 --- a/release/preview/windowsservercore/docker/Dockerfile +++ b/release/preview/windowsservercore/docker/Dockerfile @@ -63,19 +63,3 @@ RUN pwsh ` }" CMD ["pwsh.exe"] - -ARG IMAGE_NAME=mcr.microsoft.com/powershell:windowsservercore -ARG VCS_REF="none" -ARG PS_VERSION=6.2.0-preview.4 - -LABEL maintainer="PowerShell Team " ` - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" ` - description="This Dockerfile will install the latest release of PowerShell." ` - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" ` - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" ` - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" ` - org.label-schema.name="powershell" ` - org.label-schema.vendor="PowerShell" ` - org.label-schema.vcs-ref=${VCS_REF} ` - org.label-schema.version=${PS_VERSION} ` - org.label-schema.schema-version="1.0" diff --git a/release/servicing/alpine/docker/Dockerfile b/release/servicing/alpine/docker/Dockerfile index aedd4353b..0d27232a3 100644 --- a/release/servicing/alpine/docker/Dockerfile +++ b/release/servicing/alpine/docker/Dockerfile @@ -81,22 +81,4 @@ RUN apk add --no-cache \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG PS_VERSION=6.2.0 -ARG IMAGE_NAME=mcr.microsoft.com/powershell:alpine-3.8 -ARG VCS_REF="none" - -# Add label last as it's just metadata and uses a lot of parameters -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" - CMD [ "pwsh" ] diff --git a/release/servicing/centos7/docker/Dockerfile b/release/servicing/centos7/docker/Dockerfile index 43a7f8ae0..a68dc88f8 100644 --- a/release/servicing/centos7/docker/Dockerfile +++ b/release/servicing/centos7/docker/Dockerfile @@ -45,22 +45,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:centos-7 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/servicing/debian9/docker/Dockerfile b/release/servicing/debian9/docker/Dockerfile index a9485a1d1..29954e8d9 100644 --- a/release/servicing/debian9/docker/Dockerfile +++ b/release/servicing/debian9/docker/Dockerfile @@ -52,22 +52,6 @@ RUN apt-get update \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-9 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/servicing/nanoserver1809/docker/Dockerfile b/release/servicing/nanoserver1809/docker/Dockerfile index 138e5b615..922ed5b5d 100755 --- a/release/servicing/nanoserver1809/docker/Dockerfile +++ b/release/servicing/nanoserver1809/docker/Dockerfile @@ -39,22 +39,6 @@ RUN Write-host "Verifying valid Version..."; ` # Install PowerShell into NanoServer FROM ${NanoServerRepo}:${fromTag} -ARG VCS_REF="none" -ARG PS_VERSION=6.2.0 -ARG IMAGE_NAME=mcr.microsoft.com/powershell - -LABEL maintainer="PowerShell Team " ` - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" ` - description="This Dockerfile will install the latest release of PowerShell." ` - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" ` - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" ` - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" ` - org.label-schema.name="powershell" ` - org.label-schema.vcs-ref=${VCS_REF} ` - org.label-schema.vendor="PowerShell" ` - org.label-schema.version=${PS_VERSION} ` - org.label-schema.schema-version="1.0" - # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` # set a fixed location for the Module analysis cache diff --git a/release/servicing/opensuse423/docker/Dockerfile b/release/servicing/opensuse423/docker/Dockerfile index 78a009937..55d851800 100644 --- a/release/servicing/opensuse423/docker/Dockerfile +++ b/release/servicing/opensuse423/docker/Dockerfile @@ -81,22 +81,4 @@ RUN zypper --non-interactive update --skip-interactive \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG PS_VERSION=6.2.0 -ARG IMAGE_NAME=mcr.microsoft.com/powershell:opensuse-42.3 -ARG VCS_REF="none" - -# Add label last as it's just metadata and uses a lot of parameters -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" - CMD [ "pwsh" ] diff --git a/release/servicing/ubuntu16.04/docker/Dockerfile b/release/servicing/ubuntu16.04/docker/Dockerfile index 7a444019e..ada151996 100644 --- a/release/servicing/ubuntu16.04/docker/Dockerfile +++ b/release/servicing/ubuntu16.04/docker/Dockerfile @@ -49,22 +49,6 @@ RUN apt-get update \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu16.04 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/servicing/ubuntu18.04/docker/Dockerfile b/release/servicing/ubuntu18.04/docker/Dockerfile index 567088bf2..2f48a4b50 100644 --- a/release/servicing/ubuntu18.04/docker/Dockerfile +++ b/release/servicing/ubuntu18.04/docker/Dockerfile @@ -49,22 +49,6 @@ RUN apt-get update \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu18.04 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/servicing/windowsservercore/docker/Dockerfile b/release/servicing/windowsservercore/docker/Dockerfile index ff8902507..c9bb2e10c 100755 --- a/release/servicing/windowsservercore/docker/Dockerfile +++ b/release/servicing/windowsservercore/docker/Dockerfile @@ -62,19 +62,3 @@ RUN pwsh ` }" CMD ["pwsh.exe"] - -ARG IMAGE_NAME=mcr.microsoft.com/powershell:windowsservercore -ARG VCS_REF="none" -ARG PS_VERSION=6.2.0 - -LABEL maintainer="PowerShell Team " ` - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" ` - description="This Dockerfile will install the latest release of PowerShell." ` - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" ` - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" ` - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" ` - org.label-schema.name="powershell" ` - org.label-schema.vendor="PowerShell" ` - org.label-schema.vcs-ref=${VCS_REF} ` - org.label-schema.version=${PS_VERSION} ` - org.label-schema.schema-version="1.0" diff --git a/release/stable/alpine38/docker/Dockerfile b/release/stable/alpine38/docker/Dockerfile index 74602ab8e..c1e2b281c 100644 --- a/release/stable/alpine38/docker/Dockerfile +++ b/release/stable/alpine38/docker/Dockerfile @@ -83,22 +83,4 @@ RUN apk add --no-cache \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG PS_VERSION=7.0.0 -ARG IMAGE_NAME=mcr.microsoft.com/powershell:alpine-3.8 -ARG VCS_REF="none" - -# Add label last as it's just metadata and uses a lot of parameters -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" - CMD [ "pwsh" ] diff --git a/release/stable/alpine38/test-deps/docker/Dockerfile b/release/stable/alpine38/test-deps/docker/Dockerfile index 4b38aafe0..83f43feb9 100644 --- a/release/stable/alpine38/test-deps/docker/Dockerfile +++ b/release/stable/alpine38/test-deps/docker/Dockerfile @@ -31,27 +31,7 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.8 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" \ - com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node" +LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node" # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c diff --git a/release/stable/alpine39/docker/Dockerfile b/release/stable/alpine39/docker/Dockerfile index 76e2bd867..ef731b17c 100644 --- a/release/stable/alpine39/docker/Dockerfile +++ b/release/stable/alpine39/docker/Dockerfile @@ -85,22 +85,4 @@ RUN apk add --no-cache \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG PS_VERSION=6.2.0 -ARG IMAGE_NAME=mcr.microsoft.com/powershell:alpine-3.8 -ARG VCS_REF="none" - -# Add label last as it's just metadata and uses a lot of parameters -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" - CMD [ "pwsh" ] diff --git a/release/stable/alpine39/test-deps/docker/Dockerfile b/release/stable/alpine39/test-deps/docker/Dockerfile index b6bd3bf89..1fb8267a4 100644 --- a/release/stable/alpine39/test-deps/docker/Dockerfile +++ b/release/stable/alpine39/test-deps/docker/Dockerfile @@ -33,27 +33,7 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.8 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" \ - com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node" +LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node" # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c diff --git a/release/stable/arm32v7/docker/Dockerfile b/release/stable/arm32v7/docker/Dockerfile index 28471c113..729716ef3 100644 --- a/release/stable/arm32v7/docker/Dockerfile +++ b/release/stable/arm32v7/docker/Dockerfile @@ -68,22 +68,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \ # Create the pwsh symbolic link that points to powershell && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:arm32v7-ubuntu-bionic - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/stable/centos7/docker/Dockerfile b/release/stable/centos7/docker/Dockerfile index 43a7f8ae0..a68dc88f8 100644 --- a/release/stable/centos7/docker/Dockerfile +++ b/release/stable/centos7/docker/Dockerfile @@ -45,22 +45,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:centos-7 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/stable/centos7/test-deps/docker/Dockerfile b/release/stable/centos7/test-deps/docker/Dockerfile index e170a9230..b41a2cefd 100644 --- a/release/stable/centos7/test-deps/docker/Dockerfile +++ b/release/stable/centos7/test-deps/docker/Dockerfile @@ -12,26 +12,6 @@ RUN yum install -y \ && rm -rf /var/cache/yum ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos-7 -ARG PS_VERSION=7.0.0 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c diff --git a/release/stable/centos8/docker/Dockerfile b/release/stable/centos8/docker/Dockerfile index a7b80f8c6..b4dec513f 100644 --- a/release/stable/centos8/docker/Dockerfile +++ b/release/stable/centos8/docker/Dockerfile @@ -51,22 +51,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:centos-7 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/stable/centos8/test-deps/docker/Dockerfile b/release/stable/centos8/test-deps/docker/Dockerfile index 5b9e2fc53..b41a2cefd 100644 --- a/release/stable/centos8/test-deps/docker/Dockerfile +++ b/release/stable/centos8/test-deps/docker/Dockerfile @@ -13,27 +13,6 @@ RUN yum install -y \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos-7 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/stable/debian10/docker/Dockerfile b/release/stable/debian10/docker/Dockerfile index b856968a7..0b518bd55 100644 --- a/release/stable/debian10/docker/Dockerfile +++ b/release/stable/debian10/docker/Dockerfile @@ -85,22 +85,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-10 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/stable/debian10/test-deps/docker/Dockerfile b/release/stable/debian10/test-deps/docker/Dockerfile index d5b3a47d1..63bec0248 100644 --- a/release/stable/debian10/test-deps/docker/Dockerfile +++ b/release/stable/debian10/test-deps/docker/Dockerfile @@ -17,27 +17,6 @@ RUN apt-get update \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-10 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-9 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/stable/debian11/docker/Dockerfile b/release/stable/debian11/docker/Dockerfile index 7af270acb..f2d4733e2 100644 --- a/release/stable/debian11/docker/Dockerfile +++ b/release/stable/debian11/docker/Dockerfile @@ -85,22 +85,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-11 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/stable/debian11/test-deps/docker/Dockerfile b/release/stable/debian11/test-deps/docker/Dockerfile index 1f3e4563a..96a8b9a38 100644 --- a/release/stable/debian11/test-deps/docker/Dockerfile +++ b/release/stable/debian11/test-deps/docker/Dockerfile @@ -17,27 +17,6 @@ RUN apt-get update \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-11 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-11 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/stable/debian9/docker/Dockerfile b/release/stable/debian9/docker/Dockerfile index 75c6ca168..56f4fdc75 100644 --- a/release/stable/debian9/docker/Dockerfile +++ b/release/stable/debian9/docker/Dockerfile @@ -52,22 +52,6 @@ RUN apt-get update \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-9 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/stable/debian9/test-deps/docker/Dockerfile b/release/stable/debian9/test-deps/docker/Dockerfile index 538dd74c4..7ab3f2e17 100644 --- a/release/stable/debian9/test-deps/docker/Dockerfile +++ b/release/stable/debian9/test-deps/docker/Dockerfile @@ -17,27 +17,6 @@ RUN apt-get update \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-9 -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-9 -ARG PS_VERSION=7.0.0 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/stable/fedora/docker/Dockerfile b/release/stable/fedora/docker/Dockerfile index f4b08f7ad..c3242375b 100644 --- a/release/stable/fedora/docker/Dockerfile +++ b/release/stable/fedora/docker/Dockerfile @@ -86,22 +86,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:fedora28 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/stable/fedora/test-deps/docker/Dockerfile b/release/stable/fedora/test-deps/docker/Dockerfile index e0004d29a..656afd0ff 100644 --- a/release/stable/fedora/test-deps/docker/Dockerfile +++ b/release/stable/fedora/test-deps/docker/Dockerfile @@ -17,27 +17,6 @@ RUN dnf install -y \ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-${fromTag} -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:fedora-28 -ARG PS_VERSION=6.2.3 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/stable/nanoserver1809/docker/Dockerfile b/release/stable/nanoserver1809/docker/Dockerfile index 77a8ec890..810777582 100755 --- a/release/stable/nanoserver1809/docker/Dockerfile +++ b/release/stable/nanoserver1809/docker/Dockerfile @@ -41,10 +41,6 @@ FROM ${NanoServerRepo}:${fromTag} ARG fromTag=1709 -ARG VCS_REF="none" -ARG PS_VERSION=7.0.0 -ARG IMAGE_NAME=mcr.microsoft.com/powershell - # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` # set a fixed location for the Module analysis cache @@ -86,16 +82,4 @@ RUN pwsh ` Start-Sleep -Seconds 6 ; ` }" -LABEL maintainer="PowerShell Team " ` - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" ` - description="This Dockerfile will install the latest release of PowerShell." ` - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" ` - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" ` - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" ` - org.label-schema.name="powershell" ` - org.label-schema.vcs-ref=${VCS_REF} ` - org.label-schema.vendor="PowerShell" ` - org.label-schema.version=${PS_VERSION} ` - org.label-schema.schema-version="1.0" - CMD ["pwsh.exe"] diff --git a/release/stable/ubuntu16.04/docker/Dockerfile b/release/stable/ubuntu16.04/docker/Dockerfile index f9f8ab86a..5a9eaed93 100644 --- a/release/stable/ubuntu16.04/docker/Dockerfile +++ b/release/stable/ubuntu16.04/docker/Dockerfile @@ -50,22 +50,6 @@ RUN apt-get update \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu16.04 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/stable/ubuntu16.04/test-deps/docker/Dockerfile b/release/stable/ubuntu16.04/test-deps/docker/Dockerfile index 080e30692..9897b26cb 100644 --- a/release/stable/ubuntu16.04/test-deps/docker/Dockerfile +++ b/release/stable/ubuntu16.04/test-deps/docker/Dockerfile @@ -14,27 +14,6 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-16.04 -ARG PS_VERSION=6.2.0 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/stable/ubuntu18.04/docker/Dockerfile b/release/stable/ubuntu18.04/docker/Dockerfile index 1a97dd5f3..405875817 100644 --- a/release/stable/ubuntu18.04/docker/Dockerfile +++ b/release/stable/ubuntu18.04/docker/Dockerfile @@ -50,22 +50,6 @@ RUN apt-get update \ Start-Sleep -Seconds 6 ; \ }" -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu18.04 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/stable/ubuntu18.04/test-deps/docker/Dockerfile b/release/stable/ubuntu18.04/test-deps/docker/Dockerfile index e38323577..092229f24 100644 --- a/release/stable/ubuntu18.04/test-deps/docker/Dockerfile +++ b/release/stable/ubuntu18.04/test-deps/docker/Dockerfile @@ -14,27 +14,6 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -# Define args needed only for the labels -ARG VCS_REF="none" -ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-18.04 -ARG PS_VERSION=6.2.0 - -LABEL maintainer="PowerShell Team " \ - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \ - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \ - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \ - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \ - org.label-schema.name="powershell" \ - org.label-schema.vendor="PowerShell" \ - org.label-schema.version=${PS_VERSION} \ - org.label-schema.schema-version="1.0" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \ - org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \ - org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ - org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" - # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh" ] diff --git a/release/stable/windowsservercore/docker/Dockerfile b/release/stable/windowsservercore/docker/Dockerfile index 1ed47ddc9..5d3600605 100755 --- a/release/stable/windowsservercore/docker/Dockerfile +++ b/release/stable/windowsservercore/docker/Dockerfile @@ -63,19 +63,3 @@ RUN pwsh ` }" CMD ["pwsh.exe"] - -ARG IMAGE_NAME=mcr.microsoft.com/powershell:windowsservercore -ARG VCS_REF="none" -ARG PS_VERSION=6.2.0 - -LABEL maintainer="PowerShell Team " ` - readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" ` - description="This Dockerfile will install the latest release of PowerShell." ` - org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" ` - org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" ` - org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" ` - org.label-schema.name="powershell" ` - org.label-schema.vendor="PowerShell" ` - org.label-schema.vcs-ref=${VCS_REF} ` - org.label-schema.version=${PS_VERSION} ` - org.label-schema.schema-version="1.0" diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1 index 26a40fb49..6ed078f96 100644 --- a/tools/buildHelper/buildHelper.psm1 +++ b/tools/buildHelper/buildHelper.psm1 @@ -605,7 +605,6 @@ function Get-TestParams Write-Verbose -Message "To be tested, repository: $($allMeta.FullRepository) fromTag: $($actualTagData.FromTag) Tag: $($actualTagData.ActualTag) PSversion: $psversion" -Verbose $contextPath = Join-Path -Path $allMeta.imagePath -ChildPath 'docker' - $vcf_ref = git rev-parse --short HEAD $script:ErrorActionPreference = 'stop' Import-Module (Join-Path -Path $testsPath -ChildPath 'containerTestCommon.psm1') -Force if ($allMeta.meta.IsLinux) { @@ -644,7 +643,6 @@ function Get-TestParams $buildArgs['fromTag'] = $actualTagData.FromTag $buildArgs['PS_VERSION'] = $psversion $buildArgs['PACKAGE_VERSION'] = $packageVersion - $buildArgs['VCS_REF'] = $vcf_ref $buildArgs['IMAGE_NAME'] = $imageNameParam $buildArgs['BaseImage'] = $BaseImage