Finish off the labels (#440)

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 <[email protected]>" \
-      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
 

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 <[email protected]>" \
-      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" ]

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 <[email protected]>" \
-      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" ]

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 <[email protected]>" \
-      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" ]

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 <[email protected]>" \
-      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" ]

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 <[email protected]>" \
-      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" ]

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 <[email protected]>" \
-      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" ]

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 <[email protected]>" \
-      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" ]

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 <[email protected]>" \
-      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" ]

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 <[email protected]>" \
-      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" ]

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 <[email protected]>" \
-    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" ]

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 <[email protected]>" \
-      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

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 <[email protected]>" \
-    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" ]

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 <[email protected]>" \
-      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

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 <[email protected]>" \
-      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" ]