Skip to content

Commit

Permalink
Merge pull request #50 from mabrarov/feature/boost_1.75.0
Browse files Browse the repository at this point in the history
Boost 1.75.0 & fixes / updates
  • Loading branch information
mabrarov authored Dec 29, 2020
2 parents d53b597 + aa3fa28 commit d3c42ed
Show file tree
Hide file tree
Showing 44 changed files with 102 additions and 53 deletions.
2 changes: 1 addition & 1 deletion docker/boost-mingw/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion docker/boost-mingw/scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 4 additions & 3 deletions docker/boost-mingw/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/"]

Expand Down
23 changes: 23 additions & 0 deletions docker/boost-mingw/src/app/bootstrap.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions docker/boost-mingw/src/app/patches/boost-1.75.0.patch
Original file line number Diff line number Diff line change
@@ -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
13 changes: 13 additions & 0 deletions docker/boost-mingw/src/app/start.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docker/boost-msvc-2015/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion docker/boost-msvc-2015/scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions docker/boost-msvc-2015/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion docker/boost-msvc-2017/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion docker/boost-msvc-2017/scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions docker/boost-msvc-2017/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion docker/boost-msvc-2019/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion docker/boost-msvc-2019/scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions docker/boost-msvc-2019/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion docker/icu-mingw/scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docker/icu-mingw/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion docker/icu-msvc-2015/scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docker/icu-msvc-2015/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion docker/icu-msvc-2017/scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docker/icu-msvc-2017/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion docker/icu-msvc-2019/scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docker/icu-msvc-2019/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion docker/mingw/scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docker/mingw/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion docker/msvc-2015/scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docker/msvc-2015/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion docker/msvc-2017/scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docker/msvc-2017/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion docker/msvc-2019/scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docker/msvc-2019/scripts/test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion docker/msvc-2019/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion docker/openssl-mingw/scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docker/openssl-mingw/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion docker/openssl-msvc-2015/scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docker/openssl-msvc-2015/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion docker/openssl-msvc-2017/scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docker/openssl-msvc-2017/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
Loading

0 comments on commit d3c42ed

Please sign in to comment.