diff --git a/.docker/Dockerfile b/.docker/Dockerfile index eca967fb6665a13c34e79546480c2d504029a4af..efd33f3b30beaa153b749ac6cfb669f494cff66e 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 2df735637f2c21743cd290bccc49bee78a57da95..425118edef63bd4aaf7962d39f6db9db776187a3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ build/ include/libcaosdbConfig.h cert/ -.* # CMake CMakeLists.txt.user