diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 6472d2e582138e8d2aef250b93cddf71d00fd0c4..bc8753d79ae80a1fa1cf15f314adb46a094f15a3 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -7,6 +7,7 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh WORKDIR /libcaosdb/ RUN mkdir build WORKDIR /libcaosdb/build +RUN conan install .. RUN cmake .. RUN cmake --build . RUN cmake --install . --prefix /usr/local/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b67a002de9d90373c7c60fa0299205811546cdcc..8d62dda9e310d5e78828350b169bd53d6e8d582e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -130,6 +130,7 @@ build-test: - echo $PWD - mkdir build - cd build + - conan install .. - cmake .. - cmake --build .