From 788a8a14407ace44dd9115d5c1c9ac0bb6d78653 Mon Sep 17 00:00:00 2001
From: Joscha Schmiedt <joscha@schmiedt.dev>
Date: Mon, 29 Jul 2024 23:19:21 +0200
Subject: [PATCH] CHG: Update Dockerfile for Conan 2

---
 .docker/Dockerfile | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 29e439b..10b2370 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -5,9 +5,7 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh
 
 # build and install caosdb-cpplib
 WORKDIR /libcaosdb/
-RUN mkdir build
-WORKDIR /libcaosdb/build
-RUN conan create -s "compiler.libcxx=libstdc++11" -o caosdb:build_acm=True .. "caosdb/$(conan inspect --raw version ..)@_/_"
+RUN conan create -s "compiler.libcxx=libstdc++11" -o caosdb/*:build_acm=True .
 
 COPY . /caosdb-cppinttest
 WORKDIR /caosdb-cppinttest
@@ -17,10 +15,7 @@ COPY .docker/caosdb-client.json /caosdb-client.json
 
 # Build and run tests.
 # If no other command is given to the Docker image
-CMD mkdir build && \
-    cd build && \
-    conan install .. -s "compiler.libcxx=libstdc++11" && \
-    cmake .. && \
-    cmake --build . && \
+CMD make build-release &&\
+    cd build/Release &&\
     /wait-for-it.sh caosdb-server:10443 -t 500 -- \
     ctest -V
-- 
GitLab