From e1cdff8c18d7aa377849cb77e565b041579bf65d Mon Sep 17 00:00:00 2001
From: florian <f.spreckelsen@inidscale.com>
Date: Mon, 12 Jul 2021 18:35:44 +0200
Subject: [PATCH] DRAFT: pipeline
---
.docker/Dockerfile | 6 ------
.docker/install_cpplib.sh | 8 +++++---
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 455b1dc..3485ee0 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -5,9 +5,3 @@ RUN apt-get update && apt-get install -y git python3-pip
RUN apt-get install -y cmake/buster-backports
RUN pip3 install conan
-WORKDIR /
-RUN git clone https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git
-WORKDIR /caosdb-cpplib
-RUN git checkout f-extern-c
-RUN git submodule update --init --recursive
-RUN rm -rf ../.git
diff --git a/.docker/install_cpplib.sh b/.docker/install_cpplib.sh
index 03da3b1..a48d8f1 100644
--- a/.docker/install_cpplib.sh
+++ b/.docker/install_cpplib.sh
@@ -1,9 +1,11 @@
-current_dir=${pwd}
-cd /caosdb-cpplib
+git clone https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git
+git checkout f-extern-c
+git submodule update --init --recursive
+cd caosdb-cpplib
mkdir build
cd build
conan install .. -s "compiler.libcxx=libstdc++11"
cmake ..
cmake --build .
cmake --install .
-cd ${current_dir}
+cd ../..
--
GitLab