diff --git a/.docker/Dockerfile b/.docker/Dockerfile index ef6a90e2b8d8bd0b4affef030f7b24b0e39e6a2c..19de848a07f1ef97b7a5799092639152b5371d62 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -7,10 +7,7 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh WORKDIR /libcaosdb/ RUN mkdir build WORKDIR /libcaosdb/build -RUN conan install .. --profile ../conan.profile -RUN cmake .. -RUN cmake --build . -RUN cmake --install . --prefix /usr/local/ +RUN conan create .. --profile ../conan.profile COPY . /caosdb-cppinttest WORKDIR /caosdb-cppinttest @@ -20,7 +17,7 @@ RUN rm -rf .git CMD mkdir build && \ cd build && \ conan install .. --profile /libcaosdb/conan.profile \ - cmake -D CMAKE_PREFIX_PATH=/usr/local/ .. && \ + cmake .. && \ cmake --build . && \ /wait-for-it.sh caosdb-server:10443 -t 500 -- \ ctest -V diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed27c9a670fdf54d355ccb5f94f74c8627602615..6693efe95eeadeb62e8b7c9f12910cae4ad0da10 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -111,7 +111,7 @@ build-test: - mkdir build - cd build - conan install .. --profile /libcaosdb/conan.profile - - cmake -D CMAKE_PREFIX_PATH=/usr/local/ .. + - cmake .. - cmake --build . diff --git a/conanfile.txt b/conanfile.txt index c0b69cd575f5fa3980375e5141d9204ca42355ad..3c18ff144f5ed0efd7eb7d48c63483f80f208d7e 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,2 +1,2 @@ [requires] -libcaosdb/0.0.1 +libcaosdb/0.0.2