10000 Merge beta.4 release changes by TravisEz13 · Pull Request #4247 · PowerShell/PowerShell · GitHub
[go: up one dir, main page]
Skip to content

Merge beta.4 release changes #4247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 14, 2017
Merged

Merge beta.4 release changes #4247

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99e23b4
Fix the path on windows containers (#4241)
TravisEz13 Jul 13, 2017
273f22f
Updated string to reflect beta.4 version (#4238)
adityapatwardhan Jul 13, 2017
97dd140
Add beta.4 changelog (#4245)
joeyaiello Jul 13, 2017
f5260d0
sort and add new words to dictionary (#4248)
TravisEz13 Jul 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix the path on windows containers (#4241)
  • Loading branch information
@TravisEz13 @daxian-dbw
TravisEz13 authored and daxian-dbw committed Jul 13, 2017
commit 99e23b437eb08d12985fdad992a3aad11bc23b5b
4 changes: 2 additions & 2 deletions docker/release/nanoserver/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LABEL description="This Dockerfile will install the latest release of PS."

ARG POWERSHELL_ZIP=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.3/PowerShell-6.0.0-beta.3-win10-win2016-x64.zip

RUN setx /M PATH "%PATH%;%ProgramFiles%\PowerShell"
RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%"
# Setup PowerShell - Log-to > C:\Docker.log
SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
ADD $POWERSHELL_ZIP /powershell-win10-x64.zip
Expand Down < B3BE tool-tip id="tooltip-eda70911-4cbf-498a-a165-26dcd0c23452" for="expand-up-link-9-diff-21b6f19f80c362d436df4de53fe7462f8820079b417ff5af04d67177b6bb6b68" popover="manual" data-direction="ne" data-type="label" data-view-component="true" class="sr-only position-absolute">Expand Up @@ -43,4 +43,4 @@ RUN Start-Transcript -path C:\Dockerfile.log -append -IncludeInvocationHeader ;
# Persist %PSCORE% ENV variable for user convenience
ENV PSCORE='"C:\Program Files\PowerShell\latest\PowerShell.exe"'

CMD ["C:\\Program Files\\PowerShell\\latest\\PowerShell.exe"]
CMD ["PowerShell.exe"]
4 changes: 2 additions & 2 deletions docker/release/windowsservercore/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LABEL description="This Dockerfile will install the latest release of PS."

ARG POWERSHELL_MSI=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.3/PowerShell-6.0.0-beta.3-win10-win2016-x64.msi

RUN setx /M PATH "%PATH%;%ProgramFiles%\PowerShell"
RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%"
# Setup PowerShell - Log-to > C:\Docker.log
SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
ADD $POWERSHELL_MSI /PowerShell-win10-x64.msi
Expand Down Expand Up @@ -43,4 +43,4 @@ RUN Start-Transcript -path C:\Dockerfile.log -append -IncludeInvocationHeader ;
# Persist %PSCORE% ENV variable for user convenience
ENV PSCORE='"C:\Program Files\PowerShell\latest\PowerShell.exe"'

CMD ["C:\\Program Files\\PowerShell\\latest\\PowerShell.exe"]
CMD ["PowerShell.exe"]
0