Merge pull request #61 from mabrarov/feature/windows_server_2022

Feature/Windows Server 2022

Author: mabrarov

docker/README.md

@@ -4,7 +4,7 @@ Docker images building 3rd-party libraries.
 
 Assumptions for Docker images utilizing Windows Containers:
 
-1. [Docker](https://docs.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/deploy-containers-on-server) runs on [Windows Server 2019 1809](https://docs.microsoft.com/en-us/windows-server/get-started/windows-server-release-info)
-1. Docker 19.03+
-1. Commands in README files use Bash (Git Bash) syntax
+1. [Docker](https://docs.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/deploy-containers-on-server) runs on [Windows Server 2022 LTSC](https://docs.microsoft.com/en-us/windows-server/get-started/windows-server-release-info)
+1. Docker 20.10+
+1. Commands in README files use Bash (Git Bash) syntax, unless different is explicitly specified
 1. Commands in README files assume current directory is the directory where this repository is cloned

docker/boost-mingw/scripts/build.ps1

@@ -10,7 +10,7 @@ $ErrorActionPreference = "Stop"
 $project_dir = (Get-Item "${PSScriptRoot}").Parent.FullName
 $image_repository = "${env:DOCKER_USER}/$(Split-Path "${project_dir}" -Leaf)"
 #TODO: find way to deal with tags and versions
-$image_version = "2.15.0"
+$image_version = "2.16.0"
 $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)"
 
 Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision"

docker/boost-mingw/src/Dockerfile

@@ -4,7 +4,7 @@
 # Distributed under the MIT License (see accompanying LICENSE)
 #
 
-FROM abrarov/mingw:2.15.0
+FROM abrarov/mingw:2.16.0
 
 ENV BOOST_VERSION="1.80.0" \
     BOOST_RELEASE_URL="https://boostorg.jfrog.io/artifactory/main/release" \

docker/boost-mingw/src/app/bootstrap.bat

@@ -9,19 +9,22 @@ rem
 set exit_code=0
 
 if not "--%BOOST_PATCH_FILE%" == "--" (
-  set "DEFAULT_PATH=%PATH%"
+  setlocal
   set "PATH=%MSYS_HOME%\usr\bin;%PATH%"
 
   patch -uNf -p0 -i "%BOOST_PATCH_FILE%"
   set exit_code=%errorlevel%
   if %exit_code% neq 0 (
-    if %exit_code% neq 1 goto exit
+    if %exit_code% neq 1 (
+      endlocal
+      goto exit
+    )
   )
 
+  endlocal
+
   rem Reset errorlevel to zero
   cmd /c "exit /b 0"
-
-  set "PATH=%DEFAULT_PATH%"
 )
 
 set "PATH=%MINGW_HOME%\bin;%PATH%"

docker/boost-msvc-2017/README.md

@@ -14,7 +14,7 @@ docker build -t abrarov/boost-msvc-2017 docker/boost-msvc-2017/src
 
 | Name | Meaning of variable | Possible values | Default value | Comments |
 |------|---------------------|-----------------|---------------|----------|
-| BOOST_VERSION | Version of Boost to build | One of: `1.70.0`, `1.71.0`, `1.72.0`, `1.73.0`, `1.74.0`, `1.75.0`, `1.76.0`, `1.77.0`, `1.78.0`, `1.79.0`, `1.80.0` | `1.80.0` | |
+| BOOST_VERSION | Version of Boost to build | One of: `1.70.0`, `1.71.0`, `1.72.0`, `1.73.0`, `1.74.0`, `1.75.0`, `1.76.0`, `1.77.0`, `1.78.0`, `1.79.0`, `1.80.0`, `1.83.0` | `1.83.0` | |
 | BOOST_ADDRESS_MODEL | CPU architecture | One of: `32`, `64` | Undefined | When undefined then both `64` and `32` (in the same order) are built |
 | BOOST_LINKAGE | Linkage of built libraries | One of: `shared`, `static` | Undefined | When undefined then both `shared` and `static` (in the same order) are built |
 | BOOST_RUNTIME_LINKAGE | Linkage of C/C++ runtime | One of: `shared`, `static` | Undefined | When undefined then both `shared` and `static` (in the same order) are built, when `BOOST_LINKAGE` is `shared` then `static` value of `BOOST_RUNTIME_LINKAGE` is ignored |

docker/boost-msvc-2017/scripts/build.ps1

@@ -10,7 +10,7 @@ $ErrorActionPreference = "Stop"
 $project_dir = (Get-Item "${PSScriptRoot}").Parent.FullName
 $image_repository = "${env:DOCKER_USER}/$(Split-Path "${project_dir}" -Leaf)"
 #TODO: find way to deal with tags and versions
-$image_version = "2.15.0"
+$image_version = "2.16.0"
 $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)"
 
 Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision"

docker/boost-msvc-2017/src/Dockerfile

@@ -4,9 +4,9 @@
 # Distributed under the MIT License (see accompanying LICENSE)
 #
 
-FROM abrarov/msvc-2017:2.15.0
+FROM abrarov/msvc-2017:2.16.0
 
-ENV BOOST_VERSION="1.80.0" \
+ENV BOOST_VERSION="1.83.0" \
     BOOST_RELEASE_URL="https://boostorg.jfrog.io/artifactory/main/release" \
     B2_OPTIONS="--without-python --without-mpi --without-graph_parallel"
 

docker/boost-msvc-2019/README.md

@@ -14,7 +14,7 @@ docker build -t abrarov/boost-msvc-2019 docker/boost-msvc-2019/src
 
 | Name | Meaning of variable | Possible values | Default value | Comments |
 |------|---------------------|-----------------|---------------|----------|
-| BOOST_VERSION | Version of Boost to build | One of: `1.77.0`, `1.78.0`, `1.79.0`, `1.80.0` | `1.80.0` | |
+| BOOST_VERSION | Version of Boost to build | One of: `1.77.0`, `1.78.0`, `1.79.0`, `1.80.0`, `1.83.0` | `1.83.0` | |
 | BOOST_ADDRESS_MODEL | CPU architecture | One of: `32`, `64` | Undefined | When undefined then both `64` and `32` (in the same order) are built |
 | BOOST_LINKAGE | Linkage of built libraries | One of: `shared`, `static` | Undefined | When undefined then both `shared` and `static` (in the same order) are built |
 | BOOST_RUNTIME_LINKAGE | Linkage of C/C++ runtime | One of: `shared`, `static` | Undefined | When undefined then both `shared` and `static` (in the same order) are built, when `BOOST_LINKAGE` is `shared` then `static` value of `BOOST_RUNTIME_LINKAGE` is ignored |

docker/boost-msvc-2019/scripts/build.ps1

@@ -10,7 +10,7 @@ $ErrorActionPreference = "Stop"
 $project_dir = (Get-Item "${PSScriptRoot}").Parent.FullName
 $image_repository = "${env:DOCKER_USER}/$(Split-Path "${project_dir}" -Leaf)"
 #TODO: find way to deal with tags and versions
-$image_version = "2.15.0"
+$image_version = "2.16.0"
 $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)"
 
 Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision"

docker/boost-msvc-2019/src/Dockerfile

@@ -4,9 +4,9 @@
 # Distributed under the MIT License (see accompanying LICENSE)
 #
 
-FROM abrarov/msvc-2019:2.15.0
+FROM abrarov/msvc-2019:2.16.0
 
-ENV BOOST_VERSION="1.80.0" \
+ENV BOOST_VERSION="1.83.0" \
     BOOST_RELEASE_URL="https://boostorg.jfrog.io/artifactory/main/release" \
     B2_OPTIONS="--without-python --without-mpi --without-graph_parallel"
 

docker/boost-msvc-2022/README.md

@@ -14,7 +14,7 @@ docker build -t abrarov/boost-msvc-2022 docker/boost-msvc-2022/src
 
 | Name | Meaning of variable | Possible values | Default value | Comments |
 |------|---------------------|-----------------|---------------|----------|
-| BOOST_VERSION | Version of Boost to build | One of: `1.78.0`, `1.79.0`, `1.80.0` | `1.80.0` | |
+| BOOST_VERSION | Version of Boost to build | One of: `1.78.0`, `1.79.0`, `1.80.0`, `1.83.0` | `1.83.0` | |
 | BOOST_ADDRESS_MODEL | CPU architecture | One of: `32`, `64` | Undefined | When undefined then both `64` and `32` (in the same order) are built |
 | BOOST_LINKAGE | Linkage of built libraries | One of: `shared`, `static` | Undefined | When undefined then both `shared` and `static` (in the same order) are built |
 | BOOST_RUNTIME_LINKAGE | Linkage of C/C++ runtime | One of: `shared`, `static` | Undefined | When undefined then both `shared` and `static` (in the same order) are built, when `BOOST_LINKAGE` is `shared` then `static` value of `BOOST_RUNTIME_LINKAGE` is ignored |

docker/boost-msvc-2022/scripts/build.ps1

@@ -10,7 +10,7 @@ $ErrorActionPreference = "Stop"
 $project_dir = (Get-Item "${PSScriptRoot}").Parent.FullName
 $image_repository = "${env:DOCKER_USER}/$(Split-Path "${project_dir}" -Leaf)"
 #TODO: find way to deal with tags and versions
-$image_version = "2.15.0"
+$image_version = "2.16.0"
 $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)"
 
 Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision"

docker/boost-msvc-2022/src/Dockerfile

@@ -4,9 +4,9 @@
 # Distributed under the MIT License (see accompanying LICENSE)
 #
 
-FROM abrarov/msvc-2022:2.15.0
+FROM abrarov/msvc-2022:2.16.0
 
-ENV BOOST_VERSION="1.80.0" \
+ENV BOOST_VERSION="1.83.0" \
     BOOST_RELEASE_URL="https://boostorg.jfrog.io/artifactory/main/release" \
     B2_OPTIONS="--without-python --without-mpi --without-graph_parallel"
 

docker/boost-msvc-2022/src/app/bootstrap.bat

@@ -8,6 +8,25 @@ rem
 
 set exit_code=0
 
+if not "--%BOOST_PATCH_FILE%" == "--" (
+  setlocal
+  set "PATH=%MSYS_HOME%\usr\bin;%PATH%"
+
+  patch -uNf -p0 -i "%BOOST_PATCH_FILE%"
+  set exit_code=%errorlevel%
+  if %exit_code% neq 0 (
+    if %exit_code% neq 1 (
+      endlocal
+      goto exit
+    )
+  )
+
+  endlocal
+
+  rem Reset errorlevel to zero
+  cmd /c "exit /b 0"
+)
+
 call "%MSVC_BUILD_DIR%\%MSVC_CMD_BOOTSTRAP%"
 set exit_code=%errorlevel%
 if %exit_code% neq 0 goto exit

docker/boost-msvc-2022/src/app/patches/boost-1.83.0.patch

@@ -0,0 +1,50 @@
+--- ./tools/build/src/tools/msvc.jam	2024-10-27 01:03:50.705233500 +0300
++++ ./tools/build/src/tools/msvc.jam	2024-10-27 01:03:50.705233500 +0300
+@@ -23,6 +23,7 @@
+ tools on Microsoft Windows. The supported products and versions of
+ command line tools are listed below:
+
++* Visual Studio 2019-14.3
+ * Visual Studio 2019-14.2
+ * Visual Studio 2017—14.1
+ * Visual Studio 2015—14.0
+@@ -1137,7 +1138,7 @@
+         }
+         else
+         {
+-            if [ MATCH "(14.3)" : $(version) ]
++            if [ MATCH "(14.[34])" : $(version) ]
+             {
+                 if $(.debug-configuration)
+                 {
+@@ -1316,7 +1317,7 @@
+             # version from the path.
+             # FIXME: We currently detect both Microsoft Visual Studio 9.0 and
+             # 9.0express as 9.0 here.
+-            if [ MATCH "(MSVC\\\\14.3)" : $(command) ]
++            if [ MATCH "(MSVC\\\\14.[34])" : $(command) ]
+             {
+                 version = 14.3 ;
+             }
+--- ./boost/config/compiler/visualc.hpp	2023-08-09 00:02:55.000000000 +0300
++++ ./boost/config/compiler/visualc.hpp	2023-08-09 00:02:55.000000000 +0300
+@@ -365,7 +365,7 @@
+ #     define BOOST_COMPILER_VERSION 14.1
+ #   elif _MSC_VER < 1930
+ #     define BOOST_COMPILER_VERSION 14.2
+-#   elif _MSC_VER < 1940
++#   elif _MSC_VER < 1950
+ #     define BOOST_COMPILER_VERSION 14.3
+ #   else
+ #     define BOOST_COMPILER_VERSION _MSC_VER
+@@ -378,8 +378,8 @@
+ #include <boost/config/pragma_message.hpp>
+ 
+ //
+-// last known and checked version is 19.3x (VS2022):
+-#if (_MSC_VER >= 1940)
++// last known and checked version is 19.4x (VS2022 17.10):
++#if (_MSC_VER >= 1950)
+ #  if defined(BOOST_ASSERT_CONFIG)
+ #     error "Boost.Config is older than your current compiler version."
+ #  elif !defined(BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE)

docker/boost-msvc-2022/src/app/start.ps1

@@ -44,6 +44,15 @@ if (Test-Path -Path "${env:BOOST_ROOT_DIR}") {
 $env:B2_BIN = "${env:BOOST_ROOT_DIR}\b2.exe"
 $env:B2_TOOLSET = "msvc-14.3"
 
+# Prepare patch for Boost
+if (-not (Test-Path env:BOOST_PATCH_FILE)) {
+  $env:BOOST_PATCH_FILE = "${PSScriptRoot}\patches\boost-${env:BOOST_VERSION}.patch"
+}
+if (-not (Test-Path -Path "${env:BOOST_PATCH_FILE}")) {
+  Write-Warning "Patch for chosen version of Boost (${env:BOOST_VERSION}) was not found at ${env:BOOST_PATCH_FILE}"
+  $env:BOOST_PATCH_FILE = ""
+}
+
 # Build Boost.Build
 $env:MSVC_CMD_BOOTSTRAP = "vcvars64.bat"
 $env:BOOST_BOOTSTRAP = "${env:BOOST_ROOT_DIR}\bootstrap.bat"

docker/icu-mingw/scripts/build.ps1

@@ -10,7 +10,7 @@ $ErrorActionPreference = "Stop"
 $project_dir = (Get-Item "${PSScriptRoot}").Parent.FullName
 $image_repository = "${env:DOCKER_USER}/$(Split-Path "${project_dir}" -Leaf)"
 #TODO: find way to deal with tags and versions
-$image_version = "2.15.0"
+$image_version = "2.16.0"
 $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)"
 
 Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision"

docker/icu-mingw/src/Dockerfile

@@ -4,7 +4,7 @@
 # Distributed under the MIT License (see accompanying LICENSE)
 #
 
-FROM abrarov/mingw:2.15.0
+FROM abrarov/mingw:2.16.0
 
 ENV ICU_VERSION="64.2" \
     ICU_URL="http://download.icu-project.org/files/icu4c" \

docker/icu-msvc-2017/scripts/build.ps1

@@ -10,7 +10,7 @@ $ErrorActionPreference = "Stop"
 $project_dir = (Get-Item "${PSScriptRoot}").Parent.FullName
 $image_repository = "${env:DOCKER_USER}/$(Split-Path "${project_dir}" -Leaf)"
 #TODO: find way to deal with tags and versions
-$image_version = "2.15.0"
+$image_version = "2.16.0"
 $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)"
 
 Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision"

docker/icu-msvc-2017/src/Dockerfile

@@ -4,7 +4,7 @@
 # Distributed under the MIT License (see accompanying LICENSE)
 #
 
-FROM abrarov/msvc-2017:2.15.0
+FROM abrarov/msvc-2017:2.16.0
 
 ENV ICU_VERSION="64.2" \
     ICU_URL="http://download.icu-project.org/files/icu4c" \

docker/icu-msvc-2019/scripts/build.ps1

@@ -10,7 +10,7 @@ $ErrorActionPreference = "Stop"
 $project_dir = (Get-Item "${PSScriptRoot}").Parent.FullName
 $image_repository = "${env:DOCKER_USER}/$(Split-Path "${project_dir}" -Leaf)"
 #TODO: find way to deal with tags and versions
-$image_version = "2.15.0"
+$image_version = "2.16.0"
 $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)"
 
 Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision"

docker/icu-msvc-2019/src/Dockerfile

@@ -4,7 +4,7 @@
 # Distributed under the MIT License (see accompanying LICENSE)
 #
 
-FROM abrarov/msvc-2019:2.15.0
+FROM abrarov/msvc-2019:2.16.0
 
 ENV ICU_VERSION="64.2" \
     ICU_URL="http://download.icu-project.org/files/icu4c" \

docker/mingw/scripts/build.ps1

@@ -10,7 +10,7 @@ $ErrorActionPreference = "Stop"
 $project_dir = (Get-Item "${PSScriptRoot}").Parent.FullName
 $image_repository = "${env:DOCKER_USER}/$(Split-Path "${project_dir}" -Leaf)"
 #TODO: find way to deal with tags and versions
-$image_version = "2.15.0"
+$image_version = "2.16.0"
 $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)"
 
 Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision"

docker/mingw/src/Dockerfile

@@ -4,7 +4,7 @@
 # Distributed under the MIT License (see accompanying LICENSE)
 #
 
-FROM abrarov/windows-dev:2.15.0
+FROM abrarov/windows-dev:2.16.0
 
 ENV MINGW_VERSION="8.1.0" \
     MINGW_RT_FILE_SUFFIX="6" \

docker/msvc-2017/scripts/build.ps1

@@ -10,7 +10,7 @@ $ErrorActionPreference = "Stop"
 $project_dir = (Get-Item "${PSScriptRoot}").Parent.FullName
 $image_repository = "${env:DOCKER_USER}/$(Split-Path "${project_dir}" -Leaf)"
 #TODO: find way to deal with tags and versions
-$image_version = "2.15.0"
+$image_version = "2.16.0"
 $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)"
 
 Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision"

docker/msvc-2017/src/Dockerfile

@@ -4,13 +4,13 @@
 # Distributed under the MIT License (see accompanying LICENSE)
 #
 
-FROM abrarov/windows-dev:2.15.0
+FROM abrarov/windows-dev:2.16.0
 
 ENV MSVS_VERSION="15" \
     MSVS_URL="https://aka.ms/vs" \
     MSVS_DIST_NAME="vs_community.exe" \
     VSWHERE_URL="https://github.com/Microsoft/vswhere/releases/download" \
-    VSWHERE_VERSION="2.8.4" \
+    VSWHERE_VERSION="3.1.7" \
     VSWHERE_DIST_NAME="vswhere.exe"
 
 ADD ["app", "C:/app/"]

docker/msvc-2019/scripts/build.ps1

@@ -10,7 +10,7 @@ $ErrorActionPreference = "Stop"
 $project_dir = (Get-Item "${PSScriptRoot}").Parent.FullName
 $image_repository = "${env:DOCKER_USER}/$(Split-Path "${project_dir}" -Leaf)"
 #TODO: find way to deal with tags and versions
-$image_version = "2.15.0"
+$image_version = "2.16.0"
 $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)"
 
 Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision"

docker/msvc-2019/src/Dockerfile

@@ -4,13 +4,13 @@
 # Distributed under the MIT License (see accompanying LICENSE)
 #
 
-FROM abrarov/windows-dev:2.15.0
+FROM abrarov/windows-dev:2.16.0
 
 ENV MSVS_VERSION="16" \
     MSVS_URL="https://aka.ms/vs" \
     MSVS_DIST_NAME="vs_community.exe" \
     VSWHERE_URL="https://github.com/Microsoft/vswhere/releases/download" \
-    VSWHERE_VERSION="2.8.4" \
+    VSWHERE_VERSION="3.1.7" \
     VSWHERE_DIST_NAME="vswhere.exe"
 
 ADD ["app", "C:/app/"]

docker/msvc-2022/scripts/build.ps1

@@ -10,7 +10,7 @@ $ErrorActionPreference = "Stop"
 $project_dir = (Get-Item "${PSScriptRoot}").Parent.FullName
 $image_repository = "${env:DOCKER_USER}/$(Split-Path "${project_dir}" -Leaf)"
 #TODO: find way to deal with tags and versions
-$image_version = "2.15.0"
+$image_version = "2.16.0"
 $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)"
 
 Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision"

docker/msvc-2022/src/Dockerfile

@@ -4,13 +4,13 @@
 # Distributed under the MIT License (see accompanying LICENSE)
 #
 
-FROM abrarov/windows-dev:2.15.0
+FROM abrarov/windows-dev:2.16.0
 
 ENV MSVS_VERSION="17" \
     MSVS_URL="https://aka.ms/vs" \
     MSVS_DIST_NAME="vs_buildtools.exe" \
     VSWHERE_URL="https://github.com/Microsoft/vswhere/releases/download" \
-    VSWHERE_VERSION="2.8.4" \
+    VSWHERE_VERSION="3.1.7" \
     VSWHERE_DIST_NAME="vswhere.exe"
 
 ADD ["app", "C:/app/"]

docker/openssl-mingw/scripts/build.ps1

@@ -10,7 +10,7 @@ $ErrorActionPreference = "Stop"
 $project_dir = (Get-Item "${PSScriptRoot}").Parent.FullName
 $image_repository = "${env:DOCKER_USER}/$(Split-Path "${project_dir}" -Leaf)"
 #TODO: find way to deal with tags and versions
-$image_version = "2.15.0"
+$image_version = "2.16.0"
 $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)"
 
 Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision"