From 4d8eafca874b2321c0642d3b8252e97bc689c071 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Mon, 6 May 2019 17:49:37 -0700 Subject: [PATCH 1/2] Add semicolon to the end of the windows path --- release/preview/nanoserver/docker/Dockerfile | 2 +- release/preview/nanoserver1809/docker/Dockerfile | 2 +- release/preview/windowsservercore/docker/Dockerfile | 2 +- release/servicing/nanoserver/docker/Dockerfile | 2 +- release/servicing/nanoserver1809/docker/Dockerfile | 2 +- release/servicing/windowsservercore/docker/Dockerfile | 2 +- release/stable/nanoserver/docker/Dockerfile | 2 +- release/stable/nanoserver1809/docker/Dockerfile | 2 +- release/stable/windowsservercore/docker/Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/release/preview/nanoserver/docker/Dockerfile b/release/preview/nanoserver/docker/Dockerfile index 51f970be0..7f898d254 100755 --- a/release/preview/nanoserver/docker/Dockerfile +++ b/release/preview/nanoserver/docker/Dockerfile @@ -70,7 +70,7 @@ ENV ProgramFiles="C:\Program Files" ` COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"] # Set the path -RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell" +ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell;" # intialize powershell module cache RUN pwsh ` diff --git a/release/preview/nanoserver1809/docker/Dockerfile b/release/preview/nanoserver1809/docker/Dockerfile index 6efb23d27..1b379bc2e 100755 --- a/release/preview/nanoserver1809/docker/Dockerfile +++ b/release/preview/nanoserver1809/docker/Dockerfile @@ -70,7 +70,7 @@ ENV ProgramFiles="C:\Program Files" ` WindowsPATH="C:\Windows\system32;C:\Windows" # Set the path -ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell" +ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell;" COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"] diff --git a/release/preview/windowsservercore/docker/Dockerfile b/release/preview/windowsservercore/docker/Dockerfile index b9db4cbe6..49297cc9c 100755 --- a/release/preview/windowsservercore/docker/Dockerfile +++ b/release/preview/windowsservercore/docker/Dockerfile @@ -45,7 +45,7 @@ ENV ProgramFiles="C:\Program Files" ` COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"] # Set the path -RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%" +RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;" # intialize powershell module cache RUN pwsh ` diff --git a/release/servicing/nanoserver/docker/Dockerfile b/release/servicing/nanoserver/docker/Dockerfile index 5f4fd3861..bedea34c1 100755 --- a/release/servicing/nanoserver/docker/Dockerfile +++ b/release/servicing/nanoserver/docker/Dockerfile @@ -70,7 +70,7 @@ ENV ProgramFiles="C:\Program Files" ` COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"] # Set the path -RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell" +ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell;" # intialize powershell module cache RUN pwsh ` diff --git a/release/servicing/nanoserver1809/docker/Dockerfile b/release/servicing/nanoserver1809/docker/Dockerfile index b1e12b00d..5721e50cc 100755 --- a/release/servicing/nanoserver1809/docker/Dockerfile +++ b/release/servicing/nanoserver1809/docker/Dockerfile @@ -70,7 +70,7 @@ ENV ProgramFiles="C:\Program Files" ` WindowsPATH="C:\Windows\system32;C:\Windows" # Set the path -ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell" +ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell;" COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"] diff --git a/release/servicing/windowsservercore/docker/Dockerfile b/release/servicing/windowsservercore/docker/Dockerfile index 700ec32e0..7b1e26dfe 100755 --- a/release/servicing/windowsservercore/docker/Dockerfile +++ b/release/servicing/windowsservercore/docker/Dockerfile @@ -45,7 +45,7 @@ ENV ProgramFiles="C:\Program Files" ` COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"] # Set the path -RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%" +RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;" # intialize powershell module cache RUN pwsh ` diff --git a/release/stable/nanoserver/docker/Dockerfile b/release/stable/nanoserver/docker/Dockerfile index aaefaeaf7..10b01df4b 100755 --- a/release/stable/nanoserver/docker/Dockerfile +++ b/release/stable/nanoserver/docker/Dockerfile @@ -70,7 +70,7 @@ ENV ProgramFiles="C:\Program Files" ` COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"] # Set the path -RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell" +ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell;" # intialize powershell module cache RUN pwsh ` diff --git a/release/stable/nanoserver1809/docker/Dockerfile b/release/stable/nanoserver1809/docker/Dockerfile index e79e14495..cb72f754c 100755 --- a/release/stable/nanoserver1809/docker/Dockerfile +++ b/release/stable/nanoserver1809/docker/Dockerfile @@ -70,7 +70,7 @@ ENV ProgramFiles="C:\Program Files" ` WindowsPATH="C:\Windows\system32;C:\Windows" # Set the path -ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell" +ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell;" COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"] diff --git a/release/stable/windowsservercore/docker/Dockerfile b/release/stable/windowsservercore/docker/Dockerfile index 227af8093..6909666ae 100755 --- a/release/stable/windowsservercore/docker/Dockerfile +++ b/release/stable/windowsservercore/docker/Dockerfile @@ -45,7 +45,7 @@ ENV ProgramFiles="C:\Program Files" ` COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"] # Set the path -RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%" +RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;" # intialize powershell module cache RUN pwsh ` From 97f9c13c910cb170db76e05137b240117c28e2d7 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Mon, 6 May 2019 17:59:34 -0700 Subject: [PATCH 2/2] fix nanoserver edit --- release/preview/nanoserver/docker/Dockerfile | 2 +- release/servicing/nanoserver/docker/Dockerfile | 2 +- release/stable/nanoserver/docker/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release/preview/nanoserver/docker/Dockerfile b/release/preview/nanoserver/docker/Dockerfile index 7f898d254..50496e558 100755 --- a/release/preview/nanoserver/docker/Dockerfile +++ b/release/preview/nanoserver/docker/Dockerfile @@ -70,7 +70,7 @@ ENV ProgramFiles="C:\Program Files" ` COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"] # Set the path -ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell;" +RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" # intialize powershell module cache RUN pwsh ` diff --git a/release/servicing/nanoserver/docker/Dockerfile b/release/servicing/nanoserver/docker/Dockerfile index bedea34c1..03052208e 100755 --- a/release/servicing/nanoserver/docker/Dockerfile +++ b/release/servicing/nanoserver/docker/Dockerfile @@ -70,7 +70,7 @@ ENV ProgramFiles="C:\Program Files" ` COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"] # Set the path -ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell;" +RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" # intialize powershell module cache RUN pwsh ` diff --git a/release/stable/nanoserver/docker/Dockerfile b/release/stable/nanoserver/docker/Dockerfile index 10b01df4b..50a7b3bf2 100755 --- a/release/stable/nanoserver/docker/Dockerfile +++ b/release/stable/nanoserver/docker/Dockerfile @@ -70,7 +70,7 @@ ENV ProgramFiles="C:\Program Files" ` COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"] # Set the path -ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell;" +RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" # intialize powershell module cache RUN pwsh `