From eeab795f400caacb77395a9e02438413e4a044a7 Mon Sep 17 00:00:00 2001 From: Marat Abrarov Date: Mon, 13 Dec 2021 18:52:03 +0300 Subject: [PATCH] [skip ci] Updated docker images to the latest base images, the latest CMake and Boost 1.78.0. --- docker/builder/alpine/Dockerfile | 2 +- docker/builder/centos/Dockerfile | 2 +- docker/builder/ubuntu/Dockerfile | 2 +- docker/ma_echo_server/alpine/Dockerfile | 2 +- docker/ma_echo_server/distroless/Dockerfile | 2 +- docker/ma_echo_server/nanoserver/Dockerfile | 4 ++-- docker/ma_echo_server/static/Dockerfile | 18 ++++++++++++++---- .../static/patch/boost-1.78.0.patch | 14 ++++++++++++++ 8 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 docker/ma_echo_server/static/patch/boost-1.78.0.patch diff --git a/docker/builder/alpine/Dockerfile b/docker/builder/alpine/Dockerfile index 72a58d64..1ddd8227 100644 --- 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 index 56ba0c0c..f636d509 100644 --- 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 index ef7d35a5..3d607a62 100644 --- 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 index f9b35962..d1e50cd7 100644 --- 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 index 81d1d3ce..b89f7612 100644 --- 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 index ad6f17ff..f02c151f 100644 --- 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 index d715e841..5b6a6503 100644 --- 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 new file mode 100644 index 00000000..7187b166 --- /dev/null +++ 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 + ++#else ++ ++#include ++ + #endif + + #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED +