From 2be4e6628c8df6cbbdcea2f051fc90743d08e490 Mon Sep 17 00:00:00 2001
From: Joscha Schmiedt <joscha@schmiedt.dev>
Date: Tue, 30 Jul 2024 22:04:36 +0200
Subject: [PATCH] PIPELINE: Fix conan installation (use make conan)

---
 .docker/Dockerfile | 2 +-
 .gitignore         | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index eca967f..efd33f3 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -6,7 +6,7 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh
 # build and install caosdb-cpplib
 WORKDIR /libcaosdb/
 RUN conan profile detect -f
-RUN conan create -s "compiler.libcxx=libstdc++11" -o caosdb/*:build_acm=True .
+RUN make conan
 
 COPY . /caosdb-cppinttest
 WORKDIR /caosdb-cppinttest
diff --git a/.gitignore b/.gitignore
index 2df7356..425118e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 build/
 include/libcaosdbConfig.h
 cert/
-.*
 
 # CMake
 CMakeLists.txt.user
-- 
GitLab