Commit 66576de9 authored by Niklas Eiling's avatar Niklas Eiling Committed by Markus Mirz
Browse files

Docker: use the method for installing CIMpp from Dockerfile.dev also in Dockerfile.dev-centos


Signed-off-by: Niklas Eiling's avatarNiklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
parent d9c89e81
......@@ -45,7 +45,6 @@ docker:centos:
needs: []
script:
- docker build
--no-cache
--file Packaging/Docker/Dockerfile.dev-centos
--tag ${DOCKER_IMAGE_DEV}-centos:${DOCKER_TAG}
--tag ${DOCKER_IMAGE_DEV}-centos:latest .
......
FROM centos:8
ARG VILLAS_VERSION=0.8.0
ARG CIM_VERSION=IEC61970_16v29a
LABEL \
org.label-schema.schema-version = "1.0" \
......@@ -94,11 +95,11 @@ RUN dnf -y install \
qt5-qtsvg
RUN pip3 install gprof2dot
# Install CIMpp
# Install CIMpp from source
RUN cd /tmp && \
git clone --recurse-submodules https://github.com/CIM-IEC/libcimpp.git && \
git clone --recursive https://github.com/cim-iec/libcimpp.git && \
mkdir -p libcimpp/build && cd libcimpp/build && \
cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 -DUSE_CIM_VERSION=IEC61970_16v29a -DBUILD_SHARED_LIBS=ON -DBUILD_ARABICA_EXAMPLES=OFF .. && make -j$(nproc) install && \
cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 -DUSE_CIM_VERSION=${CIM_VERSION} -DBUILD_SHARED_LIBS=ON -DBUILD_ARABICA_EXAMPLES=OFF .. && make -j$(nproc) install && \
rm -rf /tmp/libcimpp
# CIMpp and VILLAS are installed here
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment