From 8171f9666aee4bee82ccd7e3a1829b309dcd2981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Guti=C3=A9rrez?= Date: Fri, 28 Mar 2025 17:35:13 +0100 Subject: [PATCH] Add fmt library as dependency Add fmt-dev to build dependencies and fmt to runtime dependencies in Dockerfile and drone pipeline. This modern C++ formatting library will be used for improved string formatting and logging. --- .drone.yml | 4 ++-- Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1e7b285..c340edb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,7 +15,7 @@ steps: - name: build hermes image: alpine commands: - - apk add -t hermes-build-deps --no-cache graphviz doxygen gcc make openssl-dev libspf2-dev cmake g++ sqlite-dev gettext-dev python3 boost-dev + - apk add -t hermes-build-deps --no-cache graphviz doxygen gcc make openssl-dev libspf2-dev cmake g++ sqlite-dev gettext-dev python3 boost-dev fmt-dev - cmake -B build_dir -D BUILD_DOCS=ON - cmake --build build_dir - name: docker image build @@ -41,7 +41,7 @@ steps: - name: build hermes image: alpine commands: - - apk add -t hermes-build-deps --no-cache graphviz doxygen gcc make openssl-dev libspf2-dev cmake g++ sqlite-dev gettext-dev python3 boost-dev + - apk add -t hermes-build-deps --no-cache graphviz doxygen gcc make openssl-dev libspf2-dev cmake g++ sqlite-dev gettext-dev python3 boost-dev fmt-dev - cmake -B build_dir - cmake --build build_dir - name: docker image build diff --git a/Dockerfile b/Dockerfile index 9ecde43..f343e6b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.18 ADD . /hermes WORKDIR /hermes -RUN apk add --no-cache graphviz doxygen gcc make openssl-dev libspf2-dev cmake g++ sqlite-dev gettext-dev python3 boost-dev +RUN apk add --no-cache graphviz doxygen gcc make openssl-dev libspf2-dev cmake g++ sqlite-dev gettext-dev python3 boost-dev fmt-dev RUN cmake -B build RUN cmake --build build RUN mkdir /hermes-installation @@ -10,5 +10,5 @@ RUN cmake --install build --prefix /hermes-installation FROM alpine:3.18 EXPOSE 25 COPY --from=0 /hermes-installation /hermes -RUN apk add --no-cache openssl libspf2 sqlite-libs libstdc++ libgcc +RUN apk add --no-cache openssl libspf2 sqlite-libs libstdc++ libgcc fmt CMD ["/hermes/bin/hermes", "/config/hermesrc"]