From 94d85578e3ab06d77eebf0633fb74851155f7901 Mon Sep 17 00:00:00 2001
From: Daniel <d.hornung@indiscale.com>
Date: Fri, 10 Nov 2023 11:34:48 +0100
Subject: [PATCH] FIX: Pipeline and dependencies

---
 .docker/Dockerfile   | 6 ++++--
 dev-requirements.txt | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index cc95db8..9a62ddc 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 415bb8e..127265c 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
-- 
GitLab