diff --git a/README.mdown b/README.mdown index 102f520..0a75766 100644 --- a/README.mdown +++ b/README.mdown @@ -6,8 +6,8 @@ Powershell scripts are included to try and recreate these build environments dir # Requirements -A Windows 10 workstation or VM with minimum 8 GB of memory is required. -The more concurrent containers you have running, the more memory and CPU cores is required. +A Windows 10.0.19041.804+ workstation or VM with minimum 8 GB of memory is required. +The more concurrent containers you have running, the more memory and CPU cores are required. **Each container requires one core and approximately 4 GB of memory.** @@ -48,19 +48,16 @@ Below is an example `docker-compose.yaml` file used to build a project configure version: '3' services: - win64_build_release: + win_build: image: win_build volumes: - .:C:/source/ - command: msbuild . ``` - `volumes:` are mounted within the Docker container. - `C:/source/` is assumed to be the project being build with MSVC. -- `command:` passes arguments to `Microsoft.VisualStudio.DevShell` unless entrypoint is otherwise defined. - To build a Windows XP project use the `image: winxp_build` container image. # Build Your Windows Project @@ -69,7 +66,28 @@ The above `docker-compose.yaml` file should be stored within your project and wi Once this file is created within your project run the following command to begin the build process. ```bash -docker-compose up +docker-compose run win_build +``` + +This will drop you into the visual studio developer shell or console for winxp. + +To modify the developer shell environments replace `command:` in your `docker-compose.yaml` with the desired environment variables or scripted build commands. + +``` +version: '3' + +services: + win_build: + image: win_build + volumes: + - .:C:/source/ + command: powershell -NoExit -Command Import-Module C:\\msvc\\Common7\\Tools\\Microsoft.VisualStudio.DevShell.dll; Enter-VsDevShell -Verbose -VsInstallPath C:\\msvc\\ + + winxp_build: + image: winxp_build + volumes: + - .:C:/source/ + command: cmd /k C:\\msvc\\Common7\\Tools\\VsDevCmd.bat ``` # Optional Workstation Scripts diff --git a/vs15.config b/vs15.config index 1b91680..592a02b 100644 --- a/vs15.config +++ b/vs15.config @@ -2,6 +2,6 @@ "version": "1.0", "components": [ "Microsoft.VisualStudio.Workload.VCTools", - "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.WinXP", + "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.WinXP" ] } diff --git a/vs16.config b/vs16.config index c1295d7..a1a2cd1 100644 --- a/vs16.config +++ b/vs16.config @@ -2,6 +2,6 @@ "version": "1.0", "components": [ "Microsoft.VisualStudio.Workload.VCTools", - "Microsoft.VisualStudio.Component.NuGet", + "Microsoft.VisualStudio.Component.NuGet" ] }