diff --git a/Dockerfile b/Dockerfile index da73008..88267f5 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,16 @@ -FROM microsoft/dotnet-framework:3.5 - -SHELL ["powershell", "-NoProfile -ExecutionPolicy Bypass -Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - - -RUN Invoke-WebRequest "https://aka.ms/vs/15/release/vs_BuildTools.exe" -OutFile vs_BuildTools.exe -UseBasicParsing ; \ - Start-Process -FilePath 'vs_BuildTools.exe' -ArgumentList '--quiet', '--norestart', '--locale en-US', '--add Microsoft.VisualStudio.Component.VC.CoreBuildTools', '--add Microsoft.VisualStudio.Component.Windows10SDK', '--add Microsoft.Net.Component.4.6.1.SDK', '--add Microsoft.Net.Component.4.6.1.TargetingPack', '--add Microsoft.VisualStudio.Component.VC.ATL', '--add Microsoft.VisualStudio.Component.VC.CLI.Support', '--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64', '--add Microsoft.VisualStudio.Component.Windows10SDK.10586', '--add Microsoft.VisualStudio.Component.VC.Modules.x86.x64', '--add Microsoft.Component.VC.Runtime.UCRTSDK', '--add Microsoft.VisualStudio.Component.Windows81SDK ' -Wait ; \ - Remove-Item .\vs_BuildTools.exe ; \ - Remove-Item -Force -Recurse 'C:\Program Files (x86)\Microsoft Visual Studio\Installer' -RUN Add-WindowsFeature Net-Framework-Core -Source d:\sources\sxs -RUN setx /M PATH $($Env:PATH + ';' + ${Env:ProgramFiles(x86)} + '\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin;' + ${Env:ALLUSERSPROFILE} + '\chocolatey\bin;C:\python27;c:\bts\external') -RUN iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) -RUN choco install git python2 cmake unzip -y -ADD ./set_windows_path.ps1 c:/set_windows_path.ps1 -RUN powershell -Command c:\set_windows_path.ps1 - +FROM microsoft/dotnet-framework:3.5 + +SHELL ["powershell", "-NoProfile -ExecutionPolicy Bypass -Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + + +RUN Invoke-WebRequest "https://aka.ms/vs/15/release/vs_BuildTools.exe" -OutFile vs_BuildTools.exe -UseBasicParsing ; \ + Start-Process -FilePath 'vs_BuildTools.exe' -ArgumentList '--quiet', '--norestart', '--locale en-US', '--add Microsoft.VisualStudio.Component.VC.CoreBuildTools', '--add Microsoft.VisualStudio.Component.Windows10SDK', '--add Microsoft.Net.Component.4.6.1.SDK', '--add Microsoft.Net.Component.4.6.1.TargetingPack', '--add Microsoft.VisualStudio.Component.VC.ATL', '--add Microsoft.VisualStudio.Component.VC.CLI.Support', '--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64', '--add Microsoft.VisualStudio.Component.Windows10SDK.10586', '--add Microsoft.VisualStudio.Component.VC.Modules.x86.x64', '--add Microsoft.Component.VC.Runtime.UCRTSDK', '--add Microsoft.VisualStudio.Component.Windows81SDK ' -Wait ; \ + Remove-Item .\vs_BuildTools.exe ; \ + Remove-Item -Force -Recurse 'C:\Program Files (x86)\Microsoft Visual Studio\Installer' +RUN Add-WindowsFeature Net-Framework-Core -Source d:\sources\sxs +RUN setx /M PATH $($Env:PATH + ';' + ${Env:ProgramFiles(x86)} + '\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin;' + ${Env:ALLUSERSPROFILE} + '\chocolatey\bin;C:\python27;c:\bts\external') +RUN iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) +RUN choco install git python2 cmake unzip -y +copy set_windows_path.ps1 c:\set_windows_path.ps1 + +RUN powershell -Command c:\set_windows_path.ps1 diff --git a/set_windows_path.ps1 b/set_windows_path.ps1 index b93b5e2..b0e6b44 100644 --- a/set_windows_path.ps1 +++ b/set_windows_path.ps1 @@ -1 +1,11 @@ -[Environment]::SetEnvironmentVariable("Path", $env:Path + ";C:\Program Files\cmake\bin", [EnvironmentVariableTarget]::Machine) \ No newline at end of file +$path = "c:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.10.25017\bin\HostX64\x64;"` ++ "c:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\bin\Roslyn;"` ++ "C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\;C:\Program Files (x86)\Windows Kits\8.1\bin\x64;"` ++ "c:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\\MSBuild\15.0\bin;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;"` ++ "c:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\;c:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\;"` ++ "C:\Python27\;C:\Python27\Scripts;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;"` ++ "C:\Users\ContainerAdministrator\AppData\Local\Microsoft\WindowsApps;C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin;"` ++ "C:\ProgramData\chocolatey\bin;C:\python27;c:\bts\external;C:\Program Files\Git\cmd;C:\Program Files\cmake\bin;" + +[Environment]::SetEnvironmentVariable("Path", $path, [EnvironmentVariableTarget]::Machine) +