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

Reduce ue4-build-prerequisites Windows image #144

Merged
merged 1 commit into from
May 18, 2021
Merged

Reduce ue4-build-prerequisites Windows image #144

Show file tree
Hide file tree
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
14 changes: 8 additions & 6 deletions ue4docker/dockerfiles/ue4-build-prerequisites/windows/install-prerequisites.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ call refreshenv
@rem Forcibly disable the git credential manager
git config --system credential.helper "" || goto :error

@rem Install the Visual Studio 2017 Build Tools workloads and components we need, excluding components with known issues in containers
@rem Install the Visual Studio 2017 Build Tools workloads and components we need
@rem (Note that we use the Visual Studio 2019 installer here because the old installer now breaks, but explicitly install the VS2017 Build Tools)
curl --progress -L "https://aka.ms/vs/16/release/vs_buildtools.exe" --output %TEMP%\vs_buildtools.exe || goto :error
%TEMP%\vs_buildtools.exe --quiet --wait --norestart --nocache ^
Expand All @@ -19,12 +19,14 @@ curl --progress -L "https://aka.ms/vs/16/release/vs_buildtools.exe" --output %TE
--installChannelUri "https://aka.ms/vs/15/release/channel" ^
--channelId VisualStudio.15.Release ^
--productId Microsoft.VisualStudio.Product.BuildTools ^
--add Microsoft.VisualStudio.Workload.VCTools;includeRecommended ^
--add Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools;includeRecommended ^
--add Microsoft.VisualStudio.Workload.UniversalBuildTools ^
--add Microsoft.VisualStudio.Workload.NetCoreBuildTools ^
--add Microsoft.VisualStudio.Workload.VCTools ^
--add Microsoft.VisualStudio.Workload.MSBuildTools ^
--add Microsoft.VisualStudio.Component.NuGet
--add Microsoft.VisualStudio.Component.NuGet ^
--add Microsoft.VisualStudio.Component.Roslyn.Compiler ^
--add Microsoft.VisualStudio.Component.Windows10SDK.17763 ^
--add Microsoft.Net.Component.4.5.TargetingPack ^
--add Microsoft.Net.Component.4.6.2.SDK ^
--add Microsoft.Net.Component.4.6.2.TargetingPack
python C:\buildtools-exitcode.py %ERRORLEVEL% || goto :error

@rem Copy pdbcopy.exe to the expected location(s)
Expand Down
2 changes: 1 addition & 1 deletion ue4docker/infrastructure/BuildConfiguration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ def _generateWindowsConfig(self):

# Store the tag for the base Windows Server Core image
self.basetag = self.args.basetag if self.args.basetag is not None else self.hostBasetag
self.baseImage = 'mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-' + self.basetag
self.baseImage = 'mcr.microsoft.com/windows/servercore:' + self.basetag
self.prereqsTag = self.basetag

# Verify that any user-specified base tag is valid
Expand Down