PowerShell · daxian-dbw · Apr 7, 2017 · Apr 7, 2017 · Apr 7, 2017 · Apr 7, 2017
diff --git a/docker/nightly/centos7/Dockerfile b/docker/nightly/centos7/Dockerfile
@@ -1,7 +1,8 @@
 FROM microsoft/powershell:centos7
-MAINTAINER Andrew Schwartzmeyer <andschwa@microsoft.com>
-LABEL Readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md"
-LABEL Description="This Dockerfile will install and build the latest release of PS."
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
+LABEL readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md"
+LABEL description="This Dockerfile will install the latest release of PS."
 
 ARG fork=PowerShell
 ARG branch=master

diff --git a/docker/nightly/fedora24/Dockerfile b/docker/nightly/fedora24/Dockerfile
@@ -1,7 +1,7 @@
 FROM microsoft/powershell:fedora24
-MAINTAINER Andrew Schwartzmeyer <andschwa@microsoft.com>
-LABEL Readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md"
-LABEL Description="This Dockerfile will install and build the latest release of PS."
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
+LABEL readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md"
+LABEL description="This Dockerfile will install the latest release of PS."
 
 ARG fork=PowerShell
 ARG branch=master

diff --git a/docker/nightly/ubuntu14.04/Dockerfile b/docker/nightly/ubuntu14.04/Dockerfile
@@ -1,7 +1,7 @@
 FROM microsoft/powershell:ubuntu14.04
-MAINTAINER Andrew Schwartzmeyer <andschwa@microsoft.com>
-LABEL Readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md"
-LABEL Description="This Dockerfile will install and build the latest release of PS."
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
+LABEL readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md"
+LABEL description="This Dockerfile will install the latest release of PS."
 
 ARG fork=PowerShell
 ARG branch=master

diff --git a/docker/nightly/ubuntu16.04/Dockerfile b/docker/nightly/ubuntu16.04/Dockerfile
@@ -1,7 +1,8 @@
 FROM microsoft/powershell:ubuntu16.04
-MAINTAINER Andrew Schwartzmeyer <andschwa@microsoft.com>
-LABEL Readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md"
-LABEL Description="This Dockerfile will install and build the latest release of PS."
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
+LABEL readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md"
+LABEL description="This Dockerfile will install the latest release of PS."
 
 ARG fork=PowerShell
 ARG branch=master

diff --git a/docker/release/centos7/Dockerfile b/docker/release/centos7/Dockerfile
@@ -1,7 +1,10 @@
 # Docker image file that describes an Centos7 image with PowerShell installed from Microsoft YUM Repo
 
 FROM centos:7
-MAINTAINER Raghu Shantha <raghus@microsoft.com>
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
+LABEL readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md"
+LABEL description="This Dockerfile will install the latest release of PS."
 
 # Setup the locale
 ENV LANG en_US.UTF-8

diff --git a/docker/release/fedora24/Dockerfile b/docker/release/fedora24/Dockerfile
@@ -1,5 +1,7 @@
 FROM fedora:24
-MAINTAINER Andrew Schwartzmeyer <andschwa@microsoft.com>
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
+LABEL readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md"
+LABEL description="This Dockerfile will install the latest release of PS."
 
 # TODO: Until a release of PowerShell for Fedora 24 is available,
 # this Dockerfile installs the CentOS 7 version for compatibility.

diff --git a/docker/release/nanoserver/Dockerfile b/docker/release/nanoserver/Dockerfile
@@ -1,16 +1,15 @@
 # escape=`
 FROM microsoft/nanoserver:latest
-MAINTAINER brycem@microsoft.com
-LABEL Readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md"
-LABEL Description="This Dockerfile will install the latest release of PS."
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
+LABEL readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md"
+LABEL description="This Dockerfile will install the latest release of PS."
 
 ARG POWERSHELL_ZIP=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.18/PowerShell-6.0.0-alpha.18-win10-win2016-x64.zip
-ARG POWERSHELL_SHA256=3D770CF4C5744992622E043A52F9A285C695BFE8F1B94BB070C4026582CA64B0
 
 # Setup PowerShell - Log-to > C:\Docker.log
 SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
 ADD $POWERSHELL_ZIP /powershell-win10-x64.zip
-ENV POWERSHELL_SHA256=$POWERSHELL_SHA256
 
 # Install PowerShell package and clean up
 RUN $ErrorActionPreference='Stop'; `
@@ -22,10 +21,6 @@ RUN $ErrorActionPreference='Stop'; `
     ('FullBuildString: '+$VerInfo.BuildLabEx) | Write-Output ; `
     ('OperatingSystem:  '+$VerInfo.ProductName+' '+$VerInfo.EditionId+' '+$VerInfo.InstallationType)  | Write-Output ; `
     [System.IO.FileInfo]$ZipFile = Get-Item -Path ./powershell-win10-x64.zip ; `
-    [String]$ZipHash=(Get-FileHash  -Path $ZipFile -Algorithm SHA256 | select -ExpandProperty Hash) ; `
-    If ($ZipHash -notmatch $Env:POWERSHELL_SHA256) { `
-      Throw [String]$('['+$ZipHash+'] does not match ['+$Env:POWERSHELL_SHA256+']!') `
-    } ; `
     New-Item -Path $Env:ProgramFiles/PowerShell -ItemType Directory -Force | out-null ; `
     [System.IO.DirectoryInfo]$PsFolder=New-Item -Path $Env:ProgramFiles\PowerShell -ItemType Directory -Force ; `
     Add-Type -AssemblyName System.IO.Compression.ZipFile ; `

diff --git a/docker/release/opensuse13.2/Dockerfile b/docker/release/opensuse13.2/Dockerfile
@@ -1,27 +0,0 @@
-# Docker image file that describes an OpenSUSE 13.2 (AKA harlequin) image with PowerShell installed from PowerShell Release
-FROM opensuse:harlequin
-LABEL maintainer Travis Plunk <travis.plunk@microsoft.com>
-
-ARG POWERSHELL_VERSION=6.0.0_alpha.18
-ARG POWERSHELL_RELEASE=v6.0.0-alpha.18
-ARG POWERSHELL_PACKAGE=powershell-$POWERSHELL_VERSION-1.suse.13.2.x86_64.rpm
-
-# Update, Install packages to generate localedef and CURL which is used by RPM
-# add the Microsoft key as trusted to install packgages using RPM
-# Install PowerShell then clean up
-RUN zypper --non-interactive update --skip-interactive \
-    && zypper --non-interactive install \
-        glibc-locale \
-        glibc-i18ndata \
-        curl \
-    && rpm --import https://packages.microsoft.com/keys/microsoft.asc \
-    && zypper --non-interactive install https://github.com/PowerShell/PowerShell/releases/download/$POWERSHELL_RELEASE/$POWERSHELL_PACKAGE \
-    && zypper --non-interactive clean --all
-
-# Setup the locale
-ENV LANG en_US.UTF-8
-ENV LC_ALL $LANG
-RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG
-
-# Use array to avoid Docker prepending /bin/sh -c
-ENTRYPOINT [ "powershell" ]

diff --git a/docker/release/opensuse42.1/Dockerfile b/docker/release/opensuse42.1/Dockerfile
@@ -1,6 +1,9 @@
 # Docker image file that describes an OpenSUSE 42.1 (AKA leap 42.1) image with PowerShell installed from PowerShell Release
 FROM opensuse:42.1
-LABEL maintainer Travis Plunk <travis.plunk@microsoft.com>
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
+LABEL readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md"
+LABEL description="This Dockerfile will install the latest release of PS."
 
 ARG POWERSHELL_VERSION=6.0.0_alpha.18
 ARG POWERSHELL_RELEASE=v6.0.0-alpha.18

diff --git a/docker/release/ubuntu14.04/Dockerfile b/docker/release/ubuntu14.04/Dockerfile
@@ -1,7 +1,10 @@
 # Docker image file that describes an Ubuntu14.04 image with PowerShell installed from Microsoft APT Repo
 
 FROM ubuntu:trusty
-MAINTAINER Raghu Shantha <raghus@microsoft.com>
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
+LABEL readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md"
+LABEL description="This Dockerfile will install the latest release of PS."
 
 # Setup the locale
 ENV LANG en_US.UTF-8

diff --git a/docker/release/ubuntu16.04/Dockerfile b/docker/release/ubuntu16.04/Dockerfile
@@ -1,7 +1,10 @@
 # Docker image file that describes an Ubuntu16.04 image with PowerShell installed from Microsoft APT Repo
 
 FROM ubuntu:xenial
-MAINTAINER Raghu Shantha <raghus@microsoft.com>
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
+LABEL readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md"
+LABEL description="This Dockerfile will install the latest release of PS."
 
 # Setup the locale
 ENV LANG en_US.UTF-8

diff --git a/docker/release/windowsservercore/Dockerfile b/docker/release/windowsservercore/Dockerfile
@@ -1,16 +1,15 @@
 # escape=`
 FROM microsoft/windowsservercore:latest
-MAINTAINER brycem@microsoft.com
-LABEL Readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md"
-LABEL Description="This Dockerfile will install the latest release of PS."
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
+LABEL readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md"
+LABEL description="This Dockerfile will install the latest release of PS."
 
 ARG POWERSHELL_MSI=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.18/PowerShell-6.0.0-alpha.18-win10-win2016-x64.msi
-ARG POWERSHELL_SHA256=07CAAB19CE891131AF7A64F267D59C15865B85ADB679E206389189E928C2E597
 
 # Setup PowerShell - Log-to > C:\Docker.log
 SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
 ADD $POWERSHELL_MSI /PowerShell-win10-x64.msi
-ENV POWERSHELL_SHA256=$POWERSHELL_SHA256
 
 # Install PowerShell package and clean up
 RUN $ErrorActionPreference='Stop'; `
@@ -22,10 +21,6 @@ RUN $ErrorActionPreference='Stop'; `
     ('FullBuildString: '+$VerInfo.BuildLabEx) | Write-Output ; `
     ('OperatingSystem:  '+$VerInfo.ProductName+' '+$VerInfo.EditionId+' '+$VerInfo.InstallationType)  | Write-Output ; `
     [System.IO.FileInfo]$MsiFile = Get-Item -Path ./PowerShell-win10-x64.msi ; `
-    [String]$MsiHash=(Get-FileHash -Path $MSiFile -Algorithm SHA256 | select -ExpandProperty Hash) ; `
-    If ($MsiHash -notmatch $Env:POWERSHELL_SHA256) { `
-      Throw [String]$('['+$MsiHash+'] does not match ['+$Env:POWERSHELL_SHA256+']!') `
-    } ; `
     Start-Process -FilePath msiexec.exe -ArgumentList '-qn','-i c:\PowerShell-win10-x64.msi', `
       '-log c:\PowerShell-win10-x64.msi.log','-norestart' -wait ; `
     $log=get-content -Path C:\PowerShell-win10-x64.msi.log -Last 10 ; `