diff --git a/docker/boost-mingw/README.md b/docker/boost-mingw/README.md index bff83df..467aadc 100644 --- a/docker/boost-mingw/README.md +++ b/docker/boost-mingw/README.md @@ -14,7 +14,7 @@ docker build -t abrarov/boost-mingw docker/boost-mingw/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.74.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.75.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 | diff --git a/docker/boost-mingw/scripts/build.ps1 b/docker/boost-mingw/scripts/build.ps1 index d24a8d1..08c477b 100644 --- a/docker/boost-mingw/scripts/build.ps1 +++ b/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.9.0" +$image_version = "2.10.0" $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)" Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision" diff --git a/docker/boost-mingw/src/Dockerfile b/docker/boost-mingw/src/Dockerfile index b99d6df..0b2dce0 100644 --- a/docker/boost-mingw/src/Dockerfile +++ b/docker/boost-mingw/src/Dockerfile @@ -4,11 +4,12 @@ # Distributed under the MIT License (see accompanying LICENSE) # -FROM abrarov/mingw:2.9.0 +FROM abrarov/mingw:2.10.0 -ENV BOOST_VERSION="1.74.0" \ +ENV BOOST_VERSION="1.75.0" \ BOOST_RELEASE_URL="https://dl.bintray.com/boostorg/release" \ - B2_OPTIONS="--without-python --without-mpi --without-graph_parallel" + B2_OPTIONS="--without-python --without-mpi --without-graph_parallel" \ + BOOST_MINGW_HOME="C:\MinGW" ADD ["app", "C:/app/"] diff --git a/docker/boost-mingw/src/app/bootstrap.bat b/docker/boost-mingw/src/app/bootstrap.bat index e4f640e..d20490a 100644 --- a/docker/boost-mingw/src/app/bootstrap.bat +++ b/docker/boost-mingw/src/app/bootstrap.bat @@ -8,6 +8,29 @@ rem set exit_code=0 +if not "--%BOOST_PATCH_MSYS_FILE%" == "--" ( + set DEFAULT_PATH=%PATH% + set exit_code=%errorlevel% + if %exit_code% neq 0 goto exit + + set PATH=%MSYS_HOME%\usr\bin;%PATH% + set exit_code=%errorlevel% + if %exit_code% neq 0 goto exit + + patch -uNf -p0 -i "%BOOST_PATCH_MSYS_FILE%" + set exit_code=%errorlevel% + if %exit_code% neq 0 ( + if %exit_code% neq 1 goto exit + ) + + rem Reset errorlevel to zero + cmd /c "exit /b 0" + + set PATH=%DEFAULT_PATH% + set exit_code=%errorlevel% + if %exit_code% neq 0 goto exit +) + set PATH=%MINGW_HOME%\bin;%PATH% set exit_code=%errorlevel% if %exit_code% neq 0 goto exit diff --git a/docker/boost-mingw/src/app/patches/boost-1.75.0.patch b/docker/boost-mingw/src/app/patches/boost-1.75.0.patch new file mode 100644 index 0000000..c0ee2c1 --- /dev/null +++ b/docker/boost-mingw/src/app/patches/boost-1.75.0.patch @@ -0,0 +1,11 @@ +--- ./bootstrap.bat 2020-12-03 08:01:08 +0300 ++++ ./bootstrap.bat 2020-12-03 08:01:08 +0300 +@@ -12,7 +12,7 @@ + if exist ".\tools\build\src\engine\b2.exe" del tools\build\src\engine\b2.exe + pushd tools\build\src\engine + +-call .\build.bat ++call .\build.bat %* + @ECHO OFF + + popd diff --git a/docker/boost-mingw/src/app/start.ps1 b/docker/boost-mingw/src/app/start.ps1 index b90274c..69e8468 100644 --- a/docker/boost-mingw/src/app/start.ps1 +++ b/docker/boost-mingw/src/app/start.ps1 @@ -39,6 +39,17 @@ if (Test-Path -Path "${env:BOOST_ROOT_DIR}") { $env:B2_BIN = "${env:BOOST_ROOT_DIR}\b2.exe" $env:B2_TOOLSET = "gcc" +# 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 = "" +} +$env:BOOST_PATCH_MSYS_FILE = "${env:BOOST_PATCH_FILE}" -replace "\\", "/" +$env:BOOST_PATCH_MSYS_FILE = "${env:BOOST_PATCH_MSYS_FILE}" -replace "^(C):", "/c" + # Build Boost C++ Libraries $address_models = @("64", "32") $boost_linkages = @("shared", "static") @@ -84,6 +95,8 @@ foreach ($address_model in ${address_models}) { $env:BOOST_BOOTSTRAP = "${env:BOOST_ROOT_DIR}\bootstrap.bat" Set-Location -Path "${env:BOOST_ROOT_DIR}" Write-Host "Building Boost.Build engine" + Write-Host "BOOST_PATCH_FILE : ${env:BOOST_PATCH_FILE}" + Write-Host "BOOST_PATCH_MSYS_FILE: ${env:BOOST_PATCH_MSYS_FILE}" & "${PSScriptRoot}\bootstrap.bat" if (${LastExitCode} -ne 0) { throw "Failed to build Boost.Build" diff --git a/docker/boost-msvc-2015/README.md b/docker/boost-msvc-2015/README.md index df93153..3b16093 100644 --- a/docker/boost-msvc-2015/README.md +++ b/docker/boost-msvc-2015/README.md @@ -14,7 +14,7 @@ docker build -t abrarov/boost-msvc-2015 docker/boost-msvc-2015/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.74.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.75.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 | diff --git a/docker/boost-msvc-2015/scripts/build.ps1 b/docker/boost-msvc-2015/scripts/build.ps1 index 5df67aa..0d64155 100644 --- a/docker/boost-msvc-2015/scripts/build.ps1 +++ b/docker/boost-msvc-2015/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.9.0" +$image_version = "2.10.0" $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)" Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision" diff --git a/docker/boost-msvc-2015/src/Dockerfile b/docker/boost-msvc-2015/src/Dockerfile index fc28a90..0ec20e2 100644 --- a/docker/boost-msvc-2015/src/Dockerfile +++ b/docker/boost-msvc-2015/src/Dockerfile @@ -4,9 +4,9 @@ # Distributed under the MIT License (see accompanying LICENSE) # -FROM abrarov/msvc-2015:2.9.0 +FROM abrarov/msvc-2015:2.10.0 -ENV BOOST_VERSION="1.74.0" \ +ENV BOOST_VERSION="1.75.0" \ BOOST_RELEASE_URL="https://dl.bintray.com/boostorg/release" \ B2_OPTIONS="--without-python --without-mpi --without-graph_parallel" diff --git a/docker/boost-msvc-2017/README.md b/docker/boost-msvc-2017/README.md index 757adb7..f51297a 100644 --- a/docker/boost-msvc-2017/README.md +++ b/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.74.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.74.0` | `1.75.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 | diff --git a/docker/boost-msvc-2017/scripts/build.ps1 b/docker/boost-msvc-2017/scripts/build.ps1 index d24a8d1..08c477b 100644 --- a/docker/boost-msvc-2017/scripts/build.ps1 +++ b/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.9.0" +$image_version = "2.10.0" $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)" Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision" diff --git a/docker/boost-msvc-2017/src/Dockerfile b/docker/boost-msvc-2017/src/Dockerfile index 6fde2ef..282df78 100644 --- a/docker/boost-msvc-2017/src/Dockerfile +++ b/docker/boost-msvc-2017/src/Dockerfile @@ -4,9 +4,9 @@ # Distributed under the MIT License (see accompanying LICENSE) # -FROM abrarov/msvc-2017:2.9.0 +FROM abrarov/msvc-2017:2.10.0 -ENV BOOST_VERSION="1.74.0" \ +ENV BOOST_VERSION="1.75.0" \ BOOST_RELEASE_URL="https://dl.bintray.com/boostorg/release" \ B2_OPTIONS="--without-python --without-mpi --without-graph_parallel" diff --git a/docker/boost-msvc-2019/README.md b/docker/boost-msvc-2019/README.md index b7248d5..58d2cbf 100644 --- a/docker/boost-msvc-2019/README.md +++ b/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.70.0`, `1.71.0`, `1.72.0`, `1.73.0`, `1.74.0` | `1.74.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.75.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 | diff --git a/docker/boost-msvc-2019/scripts/build.ps1 b/docker/boost-msvc-2019/scripts/build.ps1 index 5df67aa..0d64155 100644 --- a/docker/boost-msvc-2019/scripts/build.ps1 +++ b/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.9.0" +$image_version = "2.10.0" $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)" Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision" diff --git a/docker/boost-msvc-2019/src/Dockerfile b/docker/boost-msvc-2019/src/Dockerfile index 0383624..a15bd36 100644 --- a/docker/boost-msvc-2019/src/Dockerfile +++ b/docker/boost-msvc-2019/src/Dockerfile @@ -4,9 +4,9 @@ # Distributed under the MIT License (see accompanying LICENSE) # -FROM abrarov/msvc-2019:2.9.0 +FROM abrarov/msvc-2019:2.10.0 -ENV BOOST_VERSION="1.74.0" \ +ENV BOOST_VERSION="1.75.0" \ BOOST_RELEASE_URL="https://dl.bintray.com/boostorg/release" \ B2_OPTIONS="--without-python --without-mpi --without-graph_parallel" diff --git a/docker/icu-mingw/scripts/build.ps1 b/docker/icu-mingw/scripts/build.ps1 index d24a8d1..08c477b 100644 --- a/docker/icu-mingw/scripts/build.ps1 +++ b/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.9.0" +$image_version = "2.10.0" $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)" Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision" diff --git a/docker/icu-mingw/src/Dockerfile b/docker/icu-mingw/src/Dockerfile index 8afee0b..97fd062 100644 --- a/docker/icu-mingw/src/Dockerfile +++ b/docker/icu-mingw/src/Dockerfile @@ -4,7 +4,7 @@ # Distributed under the MIT License (see accompanying LICENSE) # -FROM abrarov/mingw:2.9.0 +FROM abrarov/mingw:2.10.0 ENV ICU_VERSION="64.2" \ ICU_URL="http://download.icu-project.org/files/icu4c" \ diff --git a/docker/icu-msvc-2015/scripts/build.ps1 b/docker/icu-msvc-2015/scripts/build.ps1 index 5df67aa..0d64155 100644 --- a/docker/icu-msvc-2015/scripts/build.ps1 +++ b/docker/icu-msvc-2015/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.9.0" +$image_version = "2.10.0" $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)" Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision" diff --git a/docker/icu-msvc-2015/src/Dockerfile b/docker/icu-msvc-2015/src/Dockerfile index e9b3bb1..76fea46 100644 --- a/docker/icu-msvc-2015/src/Dockerfile +++ b/docker/icu-msvc-2015/src/Dockerfile @@ -4,7 +4,7 @@ # Distributed under the MIT License (see accompanying LICENSE) # -FROM abrarov/msvc-2015:2.9.0 +FROM abrarov/msvc-2015:2.10.0 ENV ICU_VERSION="64.2" \ ICU_URL="http://download.icu-project.org/files/icu4c" \ diff --git a/docker/icu-msvc-2017/scripts/build.ps1 b/docker/icu-msvc-2017/scripts/build.ps1 index d24a8d1..08c477b 100644 --- a/docker/icu-msvc-2017/scripts/build.ps1 +++ b/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.9.0" +$image_version = "2.10.0" $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)" Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision" diff --git a/docker/icu-msvc-2017/src/Dockerfile b/docker/icu-msvc-2017/src/Dockerfile index 7c3ddae..2fce22c 100644 --- a/docker/icu-msvc-2017/src/Dockerfile +++ b/docker/icu-msvc-2017/src/Dockerfile @@ -4,7 +4,7 @@ # Distributed under the MIT License (see accompanying LICENSE) # -FROM abrarov/msvc-2017:2.9.0 +FROM abrarov/msvc-2017:2.10.0 ENV ICU_VERSION="64.2" \ ICU_URL="http://download.icu-project.org/files/icu4c" \ diff --git a/docker/icu-msvc-2019/scripts/build.ps1 b/docker/icu-msvc-2019/scripts/build.ps1 index 5df67aa..0d64155 100644 --- a/docker/icu-msvc-2019/scripts/build.ps1 +++ b/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.9.0" +$image_version = "2.10.0" $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)" Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision" diff --git a/docker/icu-msvc-2019/src/Dockerfile b/docker/icu-msvc-2019/src/Dockerfile index 7fd1f20..fb6ff02 100644 --- a/docker/icu-msvc-2019/src/Dockerfile +++ b/docker/icu-msvc-2019/src/Dockerfile @@ -4,7 +4,7 @@ # Distributed under the MIT License (see accompanying LICENSE) # -FROM abrarov/msvc-2019:2.9.0 +FROM abrarov/msvc-2019:2.10.0 ENV ICU_VERSION="64.2" \ ICU_URL="http://download.icu-project.org/files/icu4c" \ diff --git a/docker/mingw/scripts/build.ps1 b/docker/mingw/scripts/build.ps1 index d24a8d1..08c477b 100644 --- a/docker/mingw/scripts/build.ps1 +++ b/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.9.0" +$image_version = "2.10.0" $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)" Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision" diff --git a/docker/mingw/src/Dockerfile b/docker/mingw/src/Dockerfile index a8f518f..49a19c7 100644 --- a/docker/mingw/src/Dockerfile +++ b/docker/mingw/src/Dockerfile @@ -4,7 +4,7 @@ # Distributed under the MIT License (see accompanying LICENSE) # -FROM abrarov/windows-dev:2.9.0 +FROM abrarov/windows-dev:2.10.0 ENV MINGW_VERSION="7.3.0" \ MINGW_RT_FILE_SUFFIX="5" \ diff --git a/docker/msvc-2015/scripts/build.ps1 b/docker/msvc-2015/scripts/build.ps1 index 5df67aa..0d64155 100644 --- a/docker/msvc-2015/scripts/build.ps1 +++ b/docker/msvc-2015/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.9.0" +$image_version = "2.10.0" $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)" Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision" diff --git a/docker/msvc-2015/src/Dockerfile b/docker/msvc-2015/src/Dockerfile index abdfcee..81c581c 100644 --- a/docker/msvc-2015/src/Dockerfile +++ b/docker/msvc-2015/src/Dockerfile @@ -4,7 +4,7 @@ # Distributed under the MIT License (see accompanying LICENSE) # -FROM abrarov/windows-dev:2.9.0 +FROM abrarov/windows-dev:2.10.0 ENV MSVS_VERSION="14" \ MSVS_URL="https://go.microsoft.com/fwlink/?LinkId=532606&clcid=0x409" \ diff --git a/docker/msvc-2017/scripts/build.ps1 b/docker/msvc-2017/scripts/build.ps1 index d24a8d1..08c477b 100644 --- a/docker/msvc-2017/scripts/build.ps1 +++ b/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.9.0" +$image_version = "2.10.0" $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)" Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision" diff --git a/docker/msvc-2017/src/Dockerfile b/docker/msvc-2017/src/Dockerfile index abb02e8..f3e79c5 100644 --- a/docker/msvc-2017/src/Dockerfile +++ b/docker/msvc-2017/src/Dockerfile @@ -4,7 +4,7 @@ # Distributed under the MIT License (see accompanying LICENSE) # -FROM abrarov/windows-dev:2.9.0 +FROM abrarov/windows-dev:2.10.0 ENV MSVS_VERSION="15" \ MSVS_URL="https://aka.ms/vs" \ diff --git a/docker/msvc-2019/scripts/build.ps1 b/docker/msvc-2019/scripts/build.ps1 index 5df67aa..0d64155 100644 --- a/docker/msvc-2019/scripts/build.ps1 +++ b/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.9.0" +$image_version = "2.10.0" $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)" Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision" diff --git a/docker/msvc-2019/scripts/test.ps1 b/docker/msvc-2019/scripts/test.ps1 index c8cedbf..6b299de 100644 --- a/docker/msvc-2019/scripts/test.ps1 +++ b/docker/msvc-2019/scripts/test.ps1 @@ -11,7 +11,7 @@ $project_dir = (Get-Item "${PSScriptRoot}").Parent.FullName $image_repository = "${env:DOCKER_USER}/$(Split-Path "${project_dir}" -Leaf)" Write-Host "Get folder where MS Visual Studio 2019 is installed in container created from ${image_repository}:latest image" -docker run --rm "${image_repository}:latest" vswhere -latest -products Microsoft.VisualStudio.Product.Community -version '[15.0,16.0)' -property installationPath +docker run --rm "${image_repository}:latest" vswhere -latest -products Microsoft.VisualStudio.Product.Community -version '[16.0,17.0)' -property installationPath if (${LastExitCode} -ne 0) { throw "Failed to get folder where MS Visual Studio 2019 is installed" } diff --git a/docker/msvc-2019/src/Dockerfile b/docker/msvc-2019/src/Dockerfile index 36f6cc5..33df430 100644 --- a/docker/msvc-2019/src/Dockerfile +++ b/docker/msvc-2019/src/Dockerfile @@ -4,7 +4,7 @@ # Distributed under the MIT License (see accompanying LICENSE) # -FROM abrarov/windows-dev:2.9.0 +FROM abrarov/windows-dev:2.10.0 ENV MSVS_VERSION="16" \ MSVS_URL="https://aka.ms/vs" \ diff --git a/docker/openssl-mingw/scripts/build.ps1 b/docker/openssl-mingw/scripts/build.ps1 index d24a8d1..08c477b 100644 --- a/docker/openssl-mingw/scripts/build.ps1 +++ b/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.9.0" +$image_version = "2.10.0" $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)" Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision" diff --git a/docker/openssl-mingw/src/Dockerfile b/docker/openssl-mingw/src/Dockerfile index ecd6d79..ffa517e 100644 --- a/docker/openssl-mingw/src/Dockerfile +++ b/docker/openssl-mingw/src/Dockerfile @@ -4,7 +4,7 @@ # Distributed under the MIT License (see accompanying LICENSE) # -FROM abrarov/mingw:2.9.0 +FROM abrarov/mingw:2.10.0 ENV OPENSSL_VERSION="1.0.2q" \ OPENSSL_URL="https://www.openssl.org/source" \ diff --git a/docker/openssl-msvc-2015/scripts/build.ps1 b/docker/openssl-msvc-2015/scripts/build.ps1 index 5df67aa..0d64155 100644 --- a/docker/openssl-msvc-2015/scripts/build.ps1 +++ b/docker/openssl-msvc-2015/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.9.0" +$image_version = "2.10.0" $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)" Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision" diff --git a/docker/openssl-msvc-2015/src/Dockerfile b/docker/openssl-msvc-2015/src/Dockerfile index 13b0f9d..fff25de 100644 --- a/docker/openssl-msvc-2015/src/Dockerfile +++ b/docker/openssl-msvc-2015/src/Dockerfile @@ -4,7 +4,7 @@ # Distributed under the MIT License (see accompanying LICENSE) # -FROM abrarov/msvc-2015:2.9.0 +FROM abrarov/msvc-2015:2.10.0 ENV OPENSSL_VERSION="1.0.2q" \ OPENSSL_URL="https://www.openssl.org/source" \ diff --git a/docker/openssl-msvc-2017/scripts/build.ps1 b/docker/openssl-msvc-2017/scripts/build.ps1 index d24a8d1..08c477b 100644 --- a/docker/openssl-msvc-2017/scripts/build.ps1 +++ b/docker/openssl-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.9.0" +$image_version = "2.10.0" $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)" Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision" diff --git a/docker/openssl-msvc-2017/src/Dockerfile b/docker/openssl-msvc-2017/src/Dockerfile index 36b6574..5a061c6 100644 --- a/docker/openssl-msvc-2017/src/Dockerfile +++ b/docker/openssl-msvc-2017/src/Dockerfile @@ -4,7 +4,7 @@ # Distributed under the MIT License (see accompanying LICENSE) # -FROM abrarov/msvc-2017:2.9.0 +FROM abrarov/msvc-2017:2.10.0 ENV OPENSSL_VERSION="1.0.2q" \ OPENSSL_URL="https://www.openssl.org/source" \ diff --git a/docker/openssl-msvc-2019/scripts/build.ps1 b/docker/openssl-msvc-2019/scripts/build.ps1 index 5df67aa..0d64155 100644 --- a/docker/openssl-msvc-2019/scripts/build.ps1 +++ b/docker/openssl-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.9.0" +$image_version = "2.10.0" $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)" Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision" diff --git a/docker/openssl-msvc-2019/src/Dockerfile b/docker/openssl-msvc-2019/src/Dockerfile index 8fa1401..6472431 100644 --- a/docker/openssl-msvc-2019/src/Dockerfile +++ b/docker/openssl-msvc-2019/src/Dockerfile @@ -4,7 +4,7 @@ # Distributed under the MIT License (see accompanying LICENSE) # -FROM abrarov/msvc-2019:2.9.0 +FROM abrarov/msvc-2019:2.10.0 ENV OPENSSL_VERSION="1.0.2q" \ OPENSSL_URL="https://www.openssl.org/source" \ diff --git a/docker/windows-dev/scripts/build.ps1 b/docker/windows-dev/scripts/build.ps1 index d24a8d1..08c477b 100644 --- a/docker/windows-dev/scripts/build.ps1 +++ b/docker/windows-dev/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.9.0" +$image_version = "2.10.0" $image_revision = "$(git -C "${project_dir}" rev-parse --verify HEAD)" Write-Host "Building ${image_repository}:${image_version} image with ${image_revision} revision" diff --git a/docker/windows-dev/src/Dockerfile b/docker/windows-dev/src/Dockerfile index 5670b6a..94435a2 100644 --- a/docker/windows-dev/src/Dockerfile +++ b/docker/windows-dev/src/Dockerfile @@ -9,25 +9,25 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2019 ENV DOWNLOAD_DIR="C:\download" \ BUILD_DIR="C:\build" \ TARGET_DIR="C:\target" \ - SEVEN_ZIP_VERSION="18.01" \ + SEVEN_ZIP_VERSION="19.00" \ SEVEN_ZIP_DOWNLOAD_URL="http://www.7-zip.org/a" \ SEVEN_ZIP_HOME="C:\Program Files\7-Zip" \ - GIT_VERSION="2.24.1.2" \ - CMAKE_VERSION="3.16.2" \ + GIT_VERSION="2.29.2.3" \ + CMAKE_VERSION="3.19.2" \ CMAKE_URL="https://github.com/Kitware/CMake/releases/download" \ CMAKE_HOME="C:\cmake" \ MSYS2_URL="http://repo.msys2.org/distrib" \ MSYS2_TARGET="x86_64" \ - MSYS2_VERSION="20190524" \ + MSYS2_VERSION="20201109" \ MSYS_HOME="C:\msys64" \ ACTIVE_PERL_VERSION="5.26.3.2603" \ ACTIVE_PERL_BUILD="a95bce075" \ ACTIVE_PERL_URL="http://downloads.activestate.com/ActivePerl/releases" \ ACTIVE_PERL_HOME="C:\Perl64" \ PYTHON_URL="https://www.python.org/ftp/python" \ - PYTHON3_VERSION="3.8.1" \ + PYTHON3_VERSION="3.9.1" \ PYTHON3_HOME="C:\Python37" \ - PYTHON2_VERSION="2.7.17" \ + PYTHON2_VERSION="2.7.18" \ PYTHON2_HOME="C:\Python27" ADD ["app", "C:/app/"] diff --git a/docker/windows-dev/src/app/7z1801-x64.msi b/docker/windows-dev/src/app/7z1801-x64.msi deleted file mode 100644 index c7cb08c..0000000 Binary files a/docker/windows-dev/src/app/7z1801-x64.msi and /dev/null differ diff --git a/docker/windows-dev/src/app/install.ps1 b/docker/windows-dev/src/app/install.ps1 index 9c2b3ba..afadd6b 100644 --- a/docker/windows-dev/src/app/install.ps1 +++ b/docker/windows-dev/src/app/install.ps1 @@ -21,13 +21,14 @@ $seven_zip_version_suffix = "${env:SEVEN_ZIP_VERSION}" -replace "\.", "" $seven_zip_dist_name = "7z${seven_zip_version_suffix}-x64.msi" $seven_zip_dist = "${PSScriptRoot}\${seven_zip_dist_name}" if (-not (Test-Path -Path "${seven_zip_dist}")) { + $seven_zip_dist = "${env:TMP}\${seven_zip_dist_name}" $seven_zip_url = "${env:SEVEN_ZIP_DOWNLOAD_URL}/${seven_zip_dist_name}" - Write-Host "Downloading 7-Zip from ${seven_zip_url} into ${seven_zip_dist_name}" - (New-Object System.Net.WebClient).DownloadFile("${seven_zip_url}", "${seven_zip_dist_name}") + Write-Host "Downloading 7-Zip from ${seven_zip_url} into ${seven_zip_dist}" + (New-Object System.Net.WebClient).DownloadFile("${seven_zip_url}", "${seven_zip_dist}") } Write-Host "Installing 7-Zip from ${seven_zip_dist} into ${env:SEVEN_ZIP_HOME}" -$p = Start-Process -FilePath msiexec ` - -ArgumentList ("/package", "${seven_zip_dist}", "/quiet", "/qn", "/norestart", "TargetDir=""${env:SEVEN_ZIP_HOME}""") ` +$p = Start-Process -FilePath "${seven_zip_dist}" ` + -ArgumentList ("/norestart", "/quiet", "/qn", "ALLUSERS=1", "TargetDir=""${env:SEVEN_ZIP_HOME}""") ` -Wait -PassThru if (${p}.ExitCode -ne 0) { throw "Failed to install 7-Zip"