From e110fe4093ed5bc33309a98fbb006f8984e084c6 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Fri, 17 Nov 2017 16:47:24 -0800 Subject: [PATCH] update version regex for nanoserver docker (#5494) --- docker/release/nanoserver/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/release/nanoserver/Dockerfile b/docker/release/nanoserver/Dockerfile index 39c5e321a..ed500cb34 100755 --- a/docker/release/nanoserver/Dockerfile +++ b/docker/release/nanoserver/Dockerfile @@ -16,7 +16,7 @@ ENV PS_DOWNLOAD_URL https://github.com/PowerShell/PowerShell/releases/download/v SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -RUN if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+\.\d+)?$' )) {throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+\.\d+)?$"' -f $env:PS_VERSION)} +RUN if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) {throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION)} RUN Invoke-WebRequest $Env:PS_DOWNLOAD_URL -OutFile powershell.zip RUN Expand-Archive powershell.zip -DestinationPath \PowerShell