diff --git a/.docker/Dockerfile b/.docker/Dockerfile index cc95db8ea1827a22bc5d96dcbce6f434345ad4c6..9a62ddcdfb3d255d79c384f9c68e3cfd01a0fd7e 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -2,11 +2,15 @@ ARG DOCKER_BASE_IMAGE FROM $DOCKER_BASE_IMAGE # build and install caosdb-cpplib +COPY . /caosdb-octavelib +WORKDIR /caosdb-octavelib +RUN pip3 install -U -r dev-requirements.txt WORKDIR /libcaosdb/ RUN mkdir build WORKDIR /libcaosdb/build 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 liboctave-dev RUN apt-get install -y unzip @@ -24,9 +28,7 @@ WORKDIR /MOxUnit-master/ RUN make install COPY .docker/caosdb_client.json /caosdb_client.json -COPY . /caosdb-octavelib WORKDIR /caosdb-octavelib RUN rm -rf .git RUN pip3 install -U -r doc/requirements.txt -RUN pip3 install -U -r dev-requirements.txt diff --git a/dev-requirements.txt b/dev-requirements.txt index 415bb8e6796d0cc532e30ab38f38c880d5116fb9..127265cd60afb998da041ea22cca9d4e45a2454f 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -4,7 +4,7 @@ certifi==2021.10.8 chardet==4.0.0 charset-normalizer==2.0.7 colorama==0.4.4 -conan==1.54.0 +conan==1.61.0 deprecation==2.1.0 distro==1.6.0 fasteners==0.16.3