Skip to content
Snippets Groups Projects
Commit 788a8a14 authored by Joscha Schmiedt's avatar Joscha Schmiedt
Browse files

CHG: Update Dockerfile for Conan 2

parent 2f207051
No related branches found
No related tags found
3 merge requests!41Release 0.3.0,!35Adapt for Conan 2,!34Adapt for Conan 2
Show whitespace changes
Inline Side-by-side
Showing
with 3 additions and 8 deletions
.docker/Dockerfile
+ 3
− 8
View file @ 788a8a14
...@@ -5,9 +5,7 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh ...@@ -5,9 +5,7 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh
# build and install caosdb-cpplib # build and install caosdb-cpplib
WORKDIR /libcaosdb/ WORKDIR /libcaosdb/
RUN mkdir build RUN conan create -s "compiler.libcxx=libstdc++11" -o caosdb/*:build_acm=True .
WORKDIR /libcaosdb/build
RUN conan create -s "compiler.libcxx=libstdc++11" -o caosdb:build_acm=True .. "caosdb/$(conan inspect --raw version ..)@_/_"
COPY . /caosdb-cppinttest COPY . /caosdb-cppinttest
WORKDIR /caosdb-cppinttest WORKDIR /caosdb-cppinttest
...@@ -17,10 +15,7 @@ COPY .docker/caosdb-client.json /caosdb-client.json ...@@ -17,10 +15,7 @@ COPY .docker/caosdb-client.json /caosdb-client.json
# Build and run tests. # Build and run tests.
# If no other command is given to the Docker image # If no other command is given to the Docker image
CMD mkdir build && \ CMD make build-release &&\
cd build && \ cd build/Release &&\
conan install .. -s "compiler.libcxx=libstdc++11" && \
cmake .. && \
cmake --build . && \
/wait-for-it.sh caosdb-server:10443 -t 500 -- \ /wait-for-it.sh caosdb-server:10443 -t 500 -- \
ctest -V ctest -V
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment