Skip to content

Commit

Permalink
Boost 1.80.0 and migration to the latest version of windows-dev image.
Browse files Browse the repository at this point in the history
  • Loading branch information
mabrarov committed Aug 19, 2022
1 parent 0a01fdb commit c543609
Show file tree
Hide file tree
Showing 24 changed files with 48 additions and 26 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.75.0`, `1.76.0`, `1.77.0`, `1.78.0` | `1.78.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.80.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.14.0"
$image_version = "2.15.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-mingw/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/mingw:2.14.0
FROM abrarov/mingw:2.15.0

ENV BOOST_VERSION="1.78.0" \
ENV BOOST_VERSION="1.80.0" \
BOOST_RELEASE_URL="https://boostorg.jfrog.io/artifactory/main/release" \
B2_OPTIONS="--without-python --without-mpi --without-graph_parallel" \
BOOST_MINGW_HOME="C:\MinGW"
Expand Down
11 changes: 11 additions & 0 deletions docker/boost-mingw/src/app/patches/boost-1.79.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
11 changes: 11 additions & 0 deletions docker/boost-mingw/src/app/patches/boost-1.80.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
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.75.0`, `1.76.0`, `1.77.0`, `1.78.0` | `1.78.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.80.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.14.0"
$image_version = "2.15.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.14.0
FROM abrarov/msvc-2017:2.15.0

ENV BOOST_VERSION="1.78.0" \
ENV BOOST_VERSION="1.80.0" \
BOOST_RELEASE_URL="https://boostorg.jfrog.io/artifactory/main/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.77.0`, `1.78.0` | `1.78.0` | |
| 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_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.14.0"
$image_version = "2.15.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.14.0
FROM abrarov/msvc-2019:2.15.0

ENV BOOST_VERSION="1.78.0" \
ENV BOOST_VERSION="1.80.0" \
BOOST_RELEASE_URL="https://boostorg.jfrog.io/artifactory/main/release" \
B2_OPTIONS="--without-python --without-mpi --without-graph_parallel"

Expand Down
2 changes: 1 addition & 1 deletion docker/boost-msvc-2022/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.78.0` | |
| BOOST_VERSION | Version of Boost to build | One of: `1.78.0`, `1.79.0`, `1.80.0` | `1.80.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-2022/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.14.0"
$image_version = "2.15.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-2022/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-2022:2.14.0
FROM abrarov/msvc-2022:2.15.0

ENV BOOST_VERSION="1.78.0" \
ENV BOOST_VERSION="1.80.0" \
BOOST_RELEASE_URL="https://boostorg.jfrog.io/artifactory/main/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.14.0"
$image_version = "2.15.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.14.0
FROM abrarov/mingw:2.15.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.14.0"
$image_version = "2.15.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.14.0
FROM abrarov/msvc-2017:2.15.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.14.0"
$image_version = "2.15.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.14.0
FROM abrarov/msvc-2019:2.15.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.14.0"
$image_version = "2.15.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.14.0
FROM abrarov/windows-dev:2.15.0

ENV MINGW_VERSION="8.1.0" \
MINGW_RT_FILE_SUFFIX="6" \
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.14.0"
$image_version = "2.15.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.14.0
FROM abrarov/mingw:2.15.0

ENV OPENSSL_VERSION="1.0.2q" \
OPENSSL_URL="https://www.openssl.org/source" \
Expand Down

0 comments on commit c543609

Please sign in to comment.