Skip to content
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

fix nanoserver dockerfile #10922

Merged
merged 1 commit into from
Oct 21, 2019
Merged

fix nanoserver dockerfile #10922

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions Dockerfile.nanoserver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/windowsservercore:1709 AS base
FROM mcr.microsoft.com/windows/servercore:1709 AS base

ARG CLI_VERSION

Expand Down Expand Up @@ -35,7 +35,7 @@ RUN $python_url = ('https://www.python.org/ftp/python/{0}/python-{0}-amd64.exe'
Start-Process c:\tmp\python-installer.exe -Wait -ArgumentList @('/quiet', 'InstallAllUsers=1', 'TargetDir={0}' -f $install_folder, 'PrependPath=1', 'Shortcuts=0', 'Include_doc=0','Include_pip=1', 'Include_test=0'); \
Remove-Item tmp -Recurse -Force;

FROM microsoft/powershell:6.0.2-nanoserver
FROM mcr.microsoft.com/powershell:6.0.2-nanoserver

COPY --from=base ["tools", "tools"]

Expand All @@ -54,10 +54,10 @@ RUN pip install wheel

SHELL ["pwsh.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

RUN $folder = @('src\\azure-cli','src\\azure-cli-core','src\\azure-cli-nspkg','src\\azure-cli-command_modules-nspkg'); \
foreach($i in Get-ChildItem 'src\\command_modules\\azure-cli-*\\') \
RUN $folder = @(); \
foreach($i in Get-ChildItem 'src\\' -Exclude 'azure-cli-testsdk') \
{ \
$folder += Join-Path 'src\\command_modules\\' $i.Name \
$folder += Join-Path 'src\\' $i.Name \
} \
$wheels = Join-Path $pwd 'wheels'; \
Write-Host 'Building python packages...'; \
Expand Down