From 8ba822d523af7797a1a8d65e76f4c9b306cd4fdc Mon Sep 17 00:00:00 2001 From: Yunze Xu Date: Wed, 24 Feb 2021 00:30:15 +0800 Subject: [PATCH 1/5] Force CMake to find Python2 --- .github/workflows/ci-cpp.yaml | 2 +- build/docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-cpp.yaml b/.github/workflows/ci-cpp.yaml index d73d799e33774..1887b4333910d 100644 --- a/.github/workflows/ci-cpp.yaml +++ b/.github/workflows/ci-cpp.yaml @@ -81,7 +81,7 @@ jobs: if: steps.docs.outputs.changed_only == 'no' run: | echo "Build C++ client library" - export CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Debug -DBUILD_DYNAMIC_LIB=OFF" + export CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Debug -DBUILD_DYNAMIC_LIB=OFF -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 -DPYTHON_LIBRARY=/usr/lib/x86_64-linux-gnu/libpython2.7.so" pulsar-client-cpp/docker-build.sh - name: run c++ tests diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index 013bfdd35da24..2d0dd5ee8bfa3 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile @@ -31,7 +31,7 @@ RUN apt-get update && \ liblog4cxx-dev libprotobuf-dev libboost-all-dev google-mock libgtest-dev \ libjsoncpp-dev libxml2-utils protobuf-compiler wget \ curl doxygen openjdk-8-jdk-headless openjdk-11-jdk-headless clang-format-5.0 \ - gnupg2 golang-1.13-go zip unzip libzstd-dev libsnappy-dev python3-pip + gnupg2 golang-1.13-go zip unzip libzstd-dev libsnappy-dev python3-pip python-pip # Compile and install gtest RUN cd /usr/src/gtest && cmake . && make && cp libgtest.a /usr/lib From 2fa9c9f2bfcd3a977aed6822a7ab9022c2635227 Mon Sep 17 00:00:00 2001 From: Yunze Xu Date: Wed, 24 Feb 2021 01:20:38 +0800 Subject: [PATCH 2/5] Use my own image --- pulsar-client-cpp/docker-build.sh | 4 ++-- pulsar-client-cpp/docker-tests.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pulsar-client-cpp/docker-build.sh b/pulsar-client-cpp/docker-build.sh index 31fa5d9d1b31a..5f79546ce8424 100755 --- a/pulsar-client-cpp/docker-build.sh +++ b/pulsar-client-cpp/docker-build.sh @@ -26,8 +26,8 @@ set -e ROOT_DIR=$(git rev-parse --show-toplevel) cd $ROOT_DIR/pulsar-client-cpp -BUILD_IMAGE_NAME="${BUILD_IMAGE_NAME:-apachepulsar/pulsar-build}" -BUILD_IMAGE_VERSION="${BUILD_IMAGE_VERSION:-ubuntu-16.04}" +BUILD_IMAGE_NAME="${BUILD_IMAGE_NAME:-bewaremypower/pulsar-build}" +BUILD_IMAGE_VERSION="${BUILD_IMAGE_VERSION:-ubuntu-16.04-py2}" IMAGE="$BUILD_IMAGE_NAME:$BUILD_IMAGE_VERSION" diff --git a/pulsar-client-cpp/docker-tests.sh b/pulsar-client-cpp/docker-tests.sh index e5fd3e80969f8..a3dde7afd3060 100755 --- a/pulsar-client-cpp/docker-tests.sh +++ b/pulsar-client-cpp/docker-tests.sh @@ -33,8 +33,8 @@ fi ROOT_DIR=$(git rev-parse --show-toplevel) cd $ROOT_DIR/pulsar-client-cpp -BUILD_IMAGE_NAME="${BUILD_IMAGE_NAME:-apachepulsar/pulsar-build}" -BUILD_IMAGE_VERSION="${BUILD_IMAGE_VERSION:-ubuntu-16.04}" +BUILD_IMAGE_NAME="${BUILD_IMAGE_NAME:-bewaremypower/pulsar-build}" +BUILD_IMAGE_VERSION="${BUILD_IMAGE_VERSION:-ubuntu-16.04-py2}" IMAGE="$BUILD_IMAGE_NAME:$BUILD_IMAGE_VERSION" From b932d9aeb47940d52ef428e6f2c502933068585f Mon Sep 17 00:00:00 2001 From: Yunze Xu Date: Wed, 24 Feb 2021 15:46:34 +0800 Subject: [PATCH 3/5] Fix Dockerfile --- build/docker/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index 2d0dd5ee8bfa3..4006848c40243 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile @@ -28,10 +28,11 @@ RUN apt-get update && \ add-apt-repository ppa:openjdk-r/ppa && \ apt-get update && \ apt-get install -y tig g++ cmake libssl-dev libcurl4-openssl-dev \ - liblog4cxx-dev libprotobuf-dev libboost-all-dev google-mock libgtest-dev \ - libjsoncpp-dev libxml2-utils protobuf-compiler wget \ + liblog4cxx-dev libprotobuf-dev google-mock libgtest-dev \ + libboost-dev libboost-program-options-dev libboost-system-dev libboost-python-dev \ + libxml2-utils protobuf-compiler wget \ curl doxygen openjdk-8-jdk-headless openjdk-11-jdk-headless clang-format-5.0 \ - gnupg2 golang-1.13-go zip unzip libzstd-dev libsnappy-dev python3-pip python-pip + gnupg2 golang-1.13-go zip unzip libzstd-dev libsnappy-dev python3-pip libpython-dev # Compile and install gtest RUN cd /usr/src/gtest && cmake . && make && cp libgtest.a /usr/lib @@ -66,6 +67,7 @@ RUN wget https://artifacts.crowdin.com/repo/deb/crowdin.deb -O crowdin.deb RUN dpkg -i crowdin.deb # Install PIP and PDoc +RUN wget https://bootstrap.pypa.io/2.7/get-pip.py && python get-pip.py RUN pip3 install pdoc # Install Protobuf doc generator (requires Go) From d22d9d3be50aca15ca0f82c87064b1e555ac7dcd Mon Sep 17 00:00:00 2001 From: Yunze Xu Date: Wed, 24 Feb 2021 18:25:28 +0800 Subject: [PATCH 4/5] Remove get-pip.py --- build/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index 4006848c40243..26e6a7d4976f3 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile @@ -67,7 +67,7 @@ RUN wget https://artifacts.crowdin.com/repo/deb/crowdin.deb -O crowdin.deb RUN dpkg -i crowdin.deb # Install PIP and PDoc -RUN wget https://bootstrap.pypa.io/2.7/get-pip.py && python get-pip.py +RUN wget https://bootstrap.pypa.io/2.7/get-pip.py && python get-pip.py && rm get-pip.py RUN pip3 install pdoc # Install Protobuf doc generator (requires Go) From 0726016284993b4dd8d8ca0e4e47f06dc8571dbf Mon Sep 17 00:00:00 2001 From: Matteo Merli Date: Wed, 24 Feb 2021 12:45:56 -0800 Subject: [PATCH 5/5] Apply suggestions from code review --- pulsar-client-cpp/docker-build.sh | 2 +- pulsar-client-cpp/docker-tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pulsar-client-cpp/docker-build.sh b/pulsar-client-cpp/docker-build.sh index 5f79546ce8424..b615ae595985f 100755 --- a/pulsar-client-cpp/docker-build.sh +++ b/pulsar-client-cpp/docker-build.sh @@ -26,7 +26,7 @@ set -e ROOT_DIR=$(git rev-parse --show-toplevel) cd $ROOT_DIR/pulsar-client-cpp -BUILD_IMAGE_NAME="${BUILD_IMAGE_NAME:-bewaremypower/pulsar-build}" +BUILD_IMAGE_NAME="${BUILD_IMAGE_NAME:-apachepulsar/pulsar-build}" BUILD_IMAGE_VERSION="${BUILD_IMAGE_VERSION:-ubuntu-16.04-py2}" IMAGE="$BUILD_IMAGE_NAME:$BUILD_IMAGE_VERSION" diff --git a/pulsar-client-cpp/docker-tests.sh b/pulsar-client-cpp/docker-tests.sh index a3dde7afd3060..0969c1c4c53f9 100755 --- a/pulsar-client-cpp/docker-tests.sh +++ b/pulsar-client-cpp/docker-tests.sh @@ -33,7 +33,7 @@ fi ROOT_DIR=$(git rev-parse --show-toplevel) cd $ROOT_DIR/pulsar-client-cpp -BUILD_IMAGE_NAME="${BUILD_IMAGE_NAME:-bewaremypower/pulsar-build}" +BUILD_IMAGE_NAME="${BUILD_IMAGE_NAME:-apachepulsar/pulsar-build}" BUILD_IMAGE_VERSION="${BUILD_IMAGE_VERSION:-ubuntu-16.04-py2}" IMAGE="$BUILD_IMAGE_NAME:$BUILD_IMAGE_VERSION"