diff --git a/common/Dockerfile b/common/Dockerfile index 72f8a5071..0db17ab74 100644 --- a/common/Dockerfile +++ b/common/Dockerfile @@ -53,6 +53,8 @@ RUN dnf -y install \ jansson-devel \ libcurl-devel \ libconfig-devel \ + spdlog-devel \ + fmt-devel \ openssl-devel openssl # Build & Install Criterion @@ -63,22 +65,6 @@ RUN cd /tmp && \ cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 .. && make install && \ rm -rf /tmp/* -# Build & Install Fmtlib -RUN cd /tmp && \ - git clone --recursive https://github.com/fmtlib/fmt.git && \ - mkdir -p fmt/build && cd fmt/build && \ - git checkout 5.2.0 && \ - cmake -DBUILD_SHARED_LIBS=1 .. && make install && \ - rm -rf /tmp/* - -# Build & Install spdlog -RUN cd /tmp && \ - git clone --recursive https://github.com/gabime/spdlog.git && \ - mkdir -p spdlog/build && cd spdlog/build && \ - git checkout v1.3.1 && \ - cmake -DSPDLOG_FMT_EXTERNAL=ON -DSPDLOG_BUILD_BENCH=OFF .. && make install && \ - rm -rf /tmp/* - ENV LD_LIBRARY_PATH /usr/local/lib:/usr/local/lib64 WORKDIR /villas