Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-30 00:00:11 +01:00
Code Issues Releases Wiki Activity

docker: update Dockerfile for villas/node-dev-ubuntu image

Browse source
This commit is contained in:
Steffen Vogel 2019-01-23 15:06:50 +01:00
parent dcbac4ec6c
commit e62fac9670
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -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. - 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`. - Enable network emulation sub-system also for other node-types than `socket`.
The `rtp` node-type will support it now as well. The `rtp` node-type will support it now as well.
- Improve readabilty of log output
### Added ### Added

4
CMakeLists.txt
View file

@ -109,9 +109,9 @@ pkg_check_modules(NANOMSG IMPORTED_TARGET nanomsg)
if(NOT NANOMSG_FOUND) if(NOT NANOMSG_FOUND)
pkg_check_modules(NANOMSG IMPORTED_TARGET libnanomsg>=1.0.0) pkg_check_modules(NANOMSG IMPORTED_TARGET libnanomsg>=1.0.0)
endif() endif()
pkg_check_modules(RE IMPORTED_TARGET re) pkg_check_modules(RE IMPORTED_TARGET re>=0.5.6)
if(NOT RE_FOUND) 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() endif()
# Build options # Build options

16
packaging/docker/Dockerfile.dev-ubuntu
View file

@ -64,17 +64,21 @@ RUN pip install \
# Dependencies # Dependencies
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
libssl-dev \ libssl-dev \
libprotobuf-dev \
libprotobuf-c-dev \
uuid-dev \
libconfig-dev \ libconfig-dev \
libnl-3-dev libnl-route-3-dev \ libnl-3-dev libnl-route-3-dev \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
libjansson-dev \ libjansson-dev \
libzmq3-dev \ libzmq3-dev \
libnanomsg-dev \ libnanomsg-dev \
libprotobuf-dev \
libprotobuf-c-dev \
librabbitmq-dev \ librabbitmq-dev \
libmosquitto-dev \ libmosquitto-dev \
libcomedi-dev libcomedi-dev \
libibverbs-dev \
librdmacm-dev \
libre-dev
# Build & Install Criterion # Build & Install Criterion
RUN cd /tmp && \ RUN cd /tmp && \
@ -83,16 +87,16 @@ RUN cd /tmp && \
cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 .. && make install && \ cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 .. && make install && \
rm -rf /tmp/* rm -rf /tmp/*
# Build & Install Criterion # Build & Install libwebsockets
RUN cd /tmp && \ 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 && \ mkdir -p libwebsockets/build && cd libwebsockets/build && \
cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 .. && make install && \ cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 .. && make install && \
rm -rf /tmp/* rm -rf /tmp/*
# Build & Install libiec61850 # Build & Install libiec61850
RUN cd /tmp && \ 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 && \ mkdir -p libiec61850/build && cd libiec61850/build && \
cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 .. && make install && \ cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 .. && make install && \
rm -rf /tmp/* rm -rf /tmp/*