diff --git a/.docker/Dockerfile b/.docker/Dockerfile index bc8753d79ae80a1fa1cf15f314adb46a094f15a3..aecabd55b43aa0a4ca25d4a620e2a3909ffb7865 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get install -y openjdk-11-jdk-headless # build and run tests CMD mkdir build && \ cd build && \ - cmake .. && \ + cmake -D CMAKE_PREFIX_PATH=/usr/local/ .. && \ cmake --build . && \ /wait-for-it.sh caosdb-server:10443 -t 500 -- \ ctest diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 249dc3f19ed47d525b65cc4f1e432f510099de54..6dbfecaf28e853b5e0830d039d549037e6776824 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,11 +126,12 @@ build-test: image: $CPPINTTEST_REGISTRY_IMAGE tags: [ docker ] stage: build + needs: [] script: - echo $PWD - mkdir build - cd build - - cmake .. + - cmake -D CMAKE_PREFIX_PATH=/usr/local/ .. - cmake --build . @@ -216,6 +217,7 @@ test: cert: tags: [docker] stage: build + needs: [] image: $CPPINTTEST_REGISTRY_IMAGE artifacts: paths: