Skip to content
Snippets Groups Projects
Verified Commit 94d85578 authored by Daniel Hornung's avatar Daniel Hornung
Browse files

FIX: Pipeline and dependencies

parent 0dd16d65
No related branches found
No related tags found
No related merge requests found
Pipeline #57961 failed
...@@ -2,11 +2,15 @@ ARG DOCKER_BASE_IMAGE ...@@ -2,11 +2,15 @@ ARG DOCKER_BASE_IMAGE
FROM $DOCKER_BASE_IMAGE FROM $DOCKER_BASE_IMAGE
# build and install caosdb-cpplib # build and install caosdb-cpplib
COPY . /caosdb-octavelib
WORKDIR /caosdb-octavelib
RUN pip3 install -U -r dev-requirements.txt
WORKDIR /libcaosdb/ WORKDIR /libcaosdb/
RUN mkdir build RUN mkdir build
WORKDIR /libcaosdb/build WORKDIR /libcaosdb/build
RUN conan create .. --build=missing -s "compiler.libcxx=libstdc++11" RUN conan create .. --build=missing -s "compiler.libcxx=libstdc++11"
RUN apt-get update
RUN apt-get install -y octave-common liboctave8 octave RUN apt-get install -y octave-common liboctave8 octave
RUN apt-get install -y liboctave-dev RUN apt-get install -y liboctave-dev
RUN apt-get install -y unzip RUN apt-get install -y unzip
...@@ -24,9 +28,7 @@ WORKDIR /MOxUnit-master/ ...@@ -24,9 +28,7 @@ WORKDIR /MOxUnit-master/
RUN make install RUN make install
COPY .docker/caosdb_client.json /caosdb_client.json COPY .docker/caosdb_client.json /caosdb_client.json
COPY . /caosdb-octavelib
WORKDIR /caosdb-octavelib WORKDIR /caosdb-octavelib
RUN rm -rf .git RUN rm -rf .git
RUN pip3 install -U -r doc/requirements.txt RUN pip3 install -U -r doc/requirements.txt
RUN pip3 install -U -r dev-requirements.txt
...@@ -4,7 +4,7 @@ certifi==2021.10.8 ...@@ -4,7 +4,7 @@ certifi==2021.10.8
chardet==4.0.0 chardet==4.0.0
charset-normalizer==2.0.7 charset-normalizer==2.0.7
colorama==0.4.4 colorama==0.4.4
conan==1.54.0 conan==1.61.0
deprecation==2.1.0 deprecation==2.1.0
distro==1.6.0 distro==1.6.0
fasteners==0.16.3 fasteners==0.16.3
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment