Merge branch 'develop'

mabrarov · Dec 15, 2021 · 046b6a6 · 046b6a6
2 parents 88aad8b + c1e58d1
commit 046b6a6
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 11 deletions.
diff --git a/docker/builder/alpine/Dockerfile b/docker/builder/alpine/Dockerfile
@@ -5,7 +5,7 @@
 # file LICENSE or copy at http://www.boost.org/LICENSE_1_0.txt)
 #
 
-FROM alpine:3.14.2
+FROM alpine:3.15.0
 
 LABEL name="abrarov/asio-samples-builder-alpine" \
  description="Builder of Asio samples project on Alpine Linux"

diff --git a/docker/builder/centos/Dockerfile b/docker/builder/centos/Dockerfile
@@ -17,7 +17,7 @@ ENV PROJECT_DIR="/project" \
  MA_QT="ON" \
  MA_QT_MAJOR_VERSION="5" \
  MA_COVERAGE="OFF" \
- CMAKE_VERSION="3.21.4" \
+ CMAKE_VERSION="3.22.1" \
  PATH="/opt/cmake/bin:${PATH}"
 
 ENTRYPOINT ["/app/start.sh"]

diff --git a/docker/builder/ubuntu/Dockerfile b/docker/builder/ubuntu/Dockerfile
@@ -17,7 +17,7 @@ ENV TZ="Europe/Moscow" \
  MA_QT="ON" \
  MA_QT_MAJOR_VERSION="5" \
  MA_COVERAGE="OFF" \
- CMAKE_VERSION="3.21.4" \
+ CMAKE_VERSION="3.22.1" \
  PATH="/opt/cmake/bin:${PATH}"
 
 ENTRYPOINT ["/app/start.sh"]

diff --git a/docker/ma_echo_server/alpine/Dockerfile b/docker/ma_echo_server/alpine/Dockerfile
@@ -5,7 +5,7 @@
 # file LICENSE or copy at http://www.boost.org/LICENSE_1_0.txt)
 #
 
-FROM alpine:3.14.2
+FROM alpine:3.15.0
 
 LABEL name="abrarov/tcp-echo" \
  description="TCP echo server from Asio samples project" \

diff --git a/docker/ma_echo_server/distroless/Dockerfile b/docker/ma_echo_server/distroless/Dockerfile
@@ -21,7 +21,7 @@ RUN apt-get update && \
 
 ENV CMAKE_HOME="/opt/cmake"
 
-ARG CMAKE_VERSION="3.21.4"
+ARG CMAKE_VERSION="3.22.1"
 
 RUN mkdir -p "${CMAKE_HOME}" && \
  cmake_url="https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz" && \

diff --git a/docker/ma_echo_server/nanoserver/Dockerfile b/docker/ma_echo_server/nanoserver/Dockerfile
@@ -5,14 +5,14 @@
 # file LICENSE or copy at http://www.boost.org/LICENSE_1_0.txt)
 #
 
-FROM abrarov/msvc-2019:2.12.1 AS build
+FROM abrarov/msvc-2019:2.13.0 AS build
 
 ENV DOWNLOADS_DIR="C:\download" \
  BOOST_DIR="C:\dependencies\boost"
 
 ADD ["install", "C:/install/"]
 
-ARG BOOST_VERSION="1.77.0"
+ARG BOOST_VERSION="1.78.0"
 ARG BOOST_URL="https://boostorg.jfrog.io/ui/api/v1/download?repoKey=main&path="
 
 RUN powershell -ExecutionPolicy Bypass -File "C:\install\install.ps1"

diff --git a/docker/ma_echo_server/static/Dockerfile b/docker/ma_echo_server/static/Dockerfile
@@ -5,7 +5,7 @@
 # file LICENSE or copy at http://www.boost.org/LICENSE_1_0.txt)
 #
 
-FROM alpine:3.14.2 AS build
+FROM alpine:3.15.0 AS build
 
 RUN apk add --no-cache \
  bash \
@@ -22,13 +22,18 @@ RUN apk add --no-cache \
  icu-dev \
  python2-dev \
  libzip-dev \
- libbz2
+ libbz2 \
+ dos2unix \
+ patch
 
-ARG BOOST_VERSION="1.77.0"
+ADD ["patch", "/opt/patch"]
+
+ARG BOOST_VERSION="1.78.0"
 ARG BOOST_RELEASE_URL="https://boostorg.jfrog.io/artifactory/main/release"
 ARG BOOST_BUILD_OPTIONS="--without-mpi --without-graph_parallel"
 
-ENV BOOST_INSTALL_DIR="/opt/boost"
+ENV BOOST_INSTALL_DIR="/opt/boost" \
+ BOOST_PATCH_DIR="/opt/patch"
 
 RUN mkdir -p "${BOOST_INSTALL_DIR}" && \
  boost_build_dir="$(mktemp -d)" && \
@@ -40,6 +45,11 @@ RUN mkdir -p "${BOOST_INSTALL_DIR}" && \
  boost_bootstrap="${boost_build_dir}/bootstrap.sh" && \
  current_dir="$(pwd)" && \
  cd "${boost_build_dir}" && \
+ boost_patch_file="${BOOST_PATCH_DIR}/boost-${BOOST_VERSION}.patch" && \
+ if [[ -f "${boost_patch_file}" ]]; then \
+ echo "Patching Boost C++ Libraries using ${boost_patch_file}" && \
+ dos2unix <"${boost_patch_file}" | patch -uNf -p0 ; \
+ fi && \
  echo "Building Boost.Build engine" && \
  "${boost_bootstrap}" && \
  boost_linkage="static" && \

diff --git a/docker/ma_echo_server/static/patch/boost-1.78.0.patch b/docker/ma_echo_server/static/patch/boost-1.78.0.patch
@@ -0,0 +1,14 @@
+--- ./boost/interprocess/permissions.hpp
++++ ./boost/interprocess/permissions.hpp
+@@ -29,6 +29,10 @@
+
+ #include <boost/interprocess/detail/win32_api.hpp>
+
++#else
++
++#include <sys/stat.h>
++
+ #endif
+
+ #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
+