'Generic Commit'
Some checks failed
dropshell-build / build (push) Has been cancelled

This commit is contained in:
Your Name 2025-06-06 19:31:56 +12:00
parent 97fae20e23
commit e23cffd984

View File

@ -74,7 +74,7 @@ RUN curl -LO https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz &&
cd / && rm -rf /tmp/openssl-${OPENSSL_VERSION} /tmp/openssl-${OPENSSL_VERSION}.tar.gz cd / && rm -rf /tmp/openssl-${OPENSSL_VERSION} /tmp/openssl-${OPENSSL_VERSION}.tar.gz
# Build jsoncpp statically with musl # Build jsoncpp statically with musl
ARG JSONCPP_VERSION=1.9.5 ARG JSONCPP_VERSION=1.9.6
WORKDIR /tmp WORKDIR /tmp
RUN curl -LO https://github.com/open-source-parsers/jsoncpp/archive/refs/tags/${JSONCPP_VERSION}.tar.gz && \ RUN curl -LO https://github.com/open-source-parsers/jsoncpp/archive/refs/tags/${JSONCPP_VERSION}.tar.gz && \
tar xzf ${JSONCPP_VERSION}.tar.gz && \ tar xzf ${JSONCPP_VERSION}.tar.gz && \
@ -85,6 +85,7 @@ RUN curl -LO https://github.com/open-source-parsers/jsoncpp/archive/refs/tags/${
make install && \ make install && \
cd / && rm -rf /tmp/jsoncpp-${JSONCPP_VERSION} /tmp/${JSONCPP_VERSION}.tar.gz cd / && rm -rf /tmp/jsoncpp-${JSONCPP_VERSION} /tmp/${JSONCPP_VERSION}.tar.gz
RUN ls /usr/local/jsoncpp/include/json/version.h
#ARG DROGON_VERSION=1.9.5 #ARG DROGON_VERSION=1.9.5
RUN git clone --recurse-submodules https://github.com/drogonframework/drogon.git /tmp/drogon && \ RUN git clone --recurse-submodules https://github.com/drogonframework/drogon.git /tmp/drogon && \
@ -110,7 +111,7 @@ RUN git clone --recurse-submodules https://github.com/drogonframework/drogon.git
-DOPENSSL_USE_STATIC_LIBS=TRUE \ -DOPENSSL_USE_STATIC_LIBS=TRUE \
-DCARES_INCLUDE_DIR=/usr/local/cares/include \ -DCARES_INCLUDE_DIR=/usr/local/cares/include \
-DCARES_LIBRARY=/usr/local/cares/lib/libcares.a \ -DCARES_LIBRARY=/usr/local/cares/lib/libcares.a \
-DJSONCPP_INCLUDE_DIRS=/usr/local/jsoncpp/include/jsoncpp \ -DJSONCPP_INCLUDE_DIRS=/usr/local/jsoncpp/include \
-DJSONCPP_LIBRARIES=/usr/local/jsoncpp/lib/libjsoncpp.a \ -DJSONCPP_LIBRARIES=/usr/local/jsoncpp/lib/libjsoncpp.a \
&&\ &&\
make -j$(nproc) && \ make -j$(nproc) && \