diff --git a/build-base/Dockerfile.dropshell-build-base b/build-base/Dockerfile.dropshell-build-base index 32f6d46..8a34289 100644 --- a/build-base/Dockerfile.dropshell-build-base +++ b/build-base/Dockerfile.dropshell-build-base @@ -74,14 +74,22 @@ RUN curl -LO https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz && make install_sw && \ cd / && rm -rf /tmp/openssl-${OPENSSL_VERSION} /tmp/openssl-${OPENSSL_VERSION}.tar.gz -# Build jsoncpp statically with musl +# Build jsoncpp statically with musl - use latest stable version ARG JSONCPP_VERSION=1.9.6 WORKDIR /tmp RUN curl -LO https://github.com/open-source-parsers/jsoncpp/archive/refs/tags/${JSONCPP_VERSION}.tar.gz && \ tar xzf ${JSONCPP_VERSION}.tar.gz && \ cd jsoncpp-${JSONCPP_VERSION} && \ mkdir build && cd build && \ - cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/usr/local && \ + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=OFF \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DCMAKE_INSTALL_PREFIX=/usr/local \ + -DJSONCPP_WITH_TESTS=OFF \ + -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \ + -DJSONCPP_WITH_PKGCONFIG_SUPPORT=ON \ + -DJSONCPP_WITH_CMAKE_PACKAGE=ON && \ make -j$(nproc) && \ make install && \ cd / && rm -rf /tmp/jsoncpp-${JSONCPP_VERSION} /tmp/${JSONCPP_VERSION}.tar.gz @@ -203,8 +211,6 @@ RUN git clone --recurse-submodules https://github.com/drogonframework/drogon.git -DOPENSSL_USE_STATIC_LIBS=TRUE \ -DCARES_INCLUDE_DIR=/usr/local/include \ -DCARES_LIBRARY=/usr/local/lib/libcares.a \ - -DJSONCPP_INCLUDE_DIRS=/usr/local/include \ - -DJSONCPP_LIBRARIES=/usr/local/lib/libjsoncpp.a \ -DPostgreSQL_INCLUDE_DIR=/usr/local/include \ -DPostgreSQL_LIBRARY="/usr/local/lib/libpq.a;/usr/local/lib/libpgcommon.a;/usr/local/lib/libpgport.a" \ -DSQLite3_LIBRARY=/usr/local/lib/libsqlite3.a \ diff --git a/build.sh b/build.sh index dde1097..f7f2c6b 100755 --- a/build.sh +++ b/build.sh @@ -5,8 +5,6 @@ set -euo pipefail SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" PROJECT="ipdemo" # Define your project name here -mkdir -p "${SCRIPT_DIR}/output" - export CMAKE_BUILD_TYPE="Debug" rm -rf "${SCRIPT_DIR}/output"