diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 4bf263f49dbcd9272e88a1c7392ad7345bc4aa37..47cacfaf867e18c7ecfa8629e0d31cc00d5edf9c 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -7,7 +7,7 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh WORKDIR /libcaosdb/ RUN mkdir build WORKDIR /libcaosdb/build -RUN conan create .. --profile ../conan.profile +RUN conan create .. -s "compiler.libcxx=libstdc++11" COPY . /caosdb-cppinttest WORKDIR /caosdb-cppinttest @@ -16,7 +16,7 @@ RUN rm -rf .git # build and run tests CMD mkdir build && \ cd build && \ - conan install .. --profile /libcaosdb/conan.profile && \ + conan install .. -s "compiler.libcxx=libstdc++11" && \ cmake .. && \ cmake --build . && \ /wait-for-it.sh caosdb-server:10443 -t 500 -- \ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2691a4ad7597f246b4c680b1f7463ce654402f23..3d0056595879f94f66df9bae5cf175e92f0ce827 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,7 +97,7 @@ build-test: - echo $PWD - mkdir build - cd build - - conan install .. --profile /libcaosdb/conan.profile + - conan install .. -s "compiler.libcxx=libstdc++11" - cmake .. - cmake --build .