Skip to content
Snippets Groups Projects

Adapt for Conan 2

Merged Joscha Schmiedt requested to merge f-73-extern-adapt-to-conan-2-0 into dev
Files
8
+ 4
8
@@ -5,9 +5,8 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh
# build and install caosdb-cpplib
WORKDIR /libcaosdb/
RUN mkdir build
WORKDIR /libcaosdb/build
RUN conan create -s "compiler.libcxx=libstdc++11" -o caosdb:build_acm=True .. "caosdb/$(conan inspect --raw version ..)@_/_"
RUN conan profile detect -f
RUN make conan
COPY . /caosdb-cppinttest
WORKDIR /caosdb-cppinttest
@@ -17,10 +16,7 @@ COPY .docker/caosdb-client.json /caosdb-client.json
# Build and run tests.
# If no other command is given to the Docker image
CMD mkdir build && \
cd build && \
conan install .. -s "compiler.libcxx=libstdc++11" && \
cmake .. && \
cmake --build . && \
CMD make build-release &&\
cd build/Release &&\
/wait-for-it.sh caosdb-server:10443 -t 500 -- \
ctest -V
Loading