diff --git a/CHANGELOG.md b/CHANGELOG.md index 666725e01..8658d1964 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Node-types can now handle more than a single file-descriptor for poll() multiplexing. - Enable network emulation sub-system also for other node-types than `socket`. The `rtp` node-type will support it now as well. + - Improve readabilty of log output ### Added diff --git a/CMakeLists.txt b/CMakeLists.txt index 06d1e4da1..936fba18b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,9 +109,9 @@ pkg_check_modules(NANOMSG IMPORTED_TARGET nanomsg) if(NOT NANOMSG_FOUND) pkg_check_modules(NANOMSG IMPORTED_TARGET libnanomsg>=1.0.0) endif() -pkg_check_modules(RE IMPORTED_TARGET re) +pkg_check_modules(RE IMPORTED_TARGET re>=0.5.6) if(NOT RE_FOUND) - pkg_check_modules(RE IMPORTED_TARGET libre>=0.5.9) + pkg_check_modules(RE IMPORTED_TARGET libre>=0.5.6) endif() # Build options diff --git a/packaging/docker/Dockerfile.dev-ubuntu b/packaging/docker/Dockerfile.dev-ubuntu index 4f276fa41..7f1377f2c 100644 --- a/packaging/docker/Dockerfile.dev-ubuntu +++ b/packaging/docker/Dockerfile.dev-ubuntu @@ -64,17 +64,21 @@ RUN pip install \ # Dependencies RUN apt-get update && apt-get install -y \ libssl-dev \ + libprotobuf-dev \ + libprotobuf-c-dev \ + uuid-dev \ libconfig-dev \ libnl-3-dev libnl-route-3-dev \ libcurl4-openssl-dev \ libjansson-dev \ libzmq3-dev \ libnanomsg-dev \ - libprotobuf-dev \ - libprotobuf-c-dev \ librabbitmq-dev \ libmosquitto-dev \ - libcomedi-dev + libcomedi-dev \ + libibverbs-dev \ + librdmacm-dev \ + libre-dev # Build & Install Criterion RUN cd /tmp && \ @@ -83,16 +87,16 @@ RUN cd /tmp && \ cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 .. && make install && \ rm -rf /tmp/* -# Build & Install Criterion +# Build & Install libwebsockets RUN cd /tmp && \ - git clone -b v2.4-stable http://github.com/warmcat/libwebsockets && \ + git clone -b v3.1-stable https://github.com/warmcat/libwebsockets && \ mkdir -p libwebsockets/build && cd libwebsockets/build && \ cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 .. && make install && \ rm -rf /tmp/* # Build & Install libiec61850 RUN cd /tmp && \ - git clone -b v1.2 https://github.com/mz-automation/libiec61850 && \ + git clone -b v1.3.1 https://github.com/mz-automation/libiec61850 && \ mkdir -p libiec61850/build && cd libiec61850/build && \ cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 .. && make install && \ rm -rf /tmp/*