Commit ed13a7be authored by Steffen Vogel's avatar Steffen Vogel 🎅🏼
Browse files

fix CI


Former-commit-id: 1d8bb3f3
parent 3c7ac5e0
......@@ -19,7 +19,7 @@ stages:
docker:
stage: prepare
script:
- docker build -t ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV} .
- docker build -f Packaging/Docker/Dockerfile.dev -t ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV} .
- docker images
tags:
- shell
......
......@@ -27,8 +27,8 @@ if(SPHINX_EXECUTABLE)
"${CMAKE_CURRENT_BINARY_DIR}/html/Figures/"
COMMAND
${CMAKE_COMMAND} -E copy
"${CMAKE_CURRENT_SOURCE_DIR}/../Figures/dpsim.png"
"${CMAKE_CURRENT_SOURCE_DIR}/../Figures/eonerc_logo.png"
"${CMAKE_CURRENT_SOURCE_DIR}/Figures/dpsim.png"
"${CMAKE_CURRENT_SOURCE_DIR}/Figures/eonerc_logo.png"
"${CMAKE_CURRENT_BINARY_DIR}/html/Figures/"
COMMENT "Copying figures to Sphinx output dir"
)
......
FROM fedora:27
FROM fedora:28
LABEL \
org.label-schema.schema-version = "1.0" \
......@@ -24,37 +24,24 @@ RUN dnf -y install \
doxygen \
graphviz \
pandoc \
python3-pip
python3-pip \
pkg-config
# Install some debuginfos
RUN dnf -y debuginfo-install \
python3 \
villas-node
villas-node \
expat
# Dependencies
RUN dnf -y install \
python3-devel \
eigen3-devel \
villas-node-devel \
expat-devel \
libcimpp16v29a
RUN dnf -y install \
pkg-config \
expat \
expat-devel
# Python Packages
ADD requirements.txt .
RUN pip3 install -r requirements.txt
ENV LD_LIBRARY_PATH /usr/local/lib64
RUN useradd -m dpsim
COPY Source/ /home/dpsim/Source/
COPY CMake/ /home/dpsim/CMake/
COPY Documentation/ /home/dpsim/Documentation/
COPY Examples/ /home/dpsim/Examples/
COPY Dependencies/ /home/dpsim/Dependencies/
COPY CMakeLists.txt COPYING.md README.md setup.py /home/dpsim/
WORKDIR /home/dpsim
RUN python3 setup.py install
ADD requirements.txt .
RUN pip3 install -r requirements.txt
\ No newline at end of file
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