diff --git a/.docker/Dockerfile b/.docker/Dockerfile index f6b397ede56bd77ed1e22dca9ac480461822e144..37a931c045a0de13445b5af4e7e677c245072693 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,4 +1,5 @@ ARG CPPLIB_REGISTRY_IMAGE +ARG CPPLIB_VERSION FROM $CPPLIB_REGISTRY_IMAGE COPY .docker/wait-for-it.sh /wait-for-it.sh @@ -17,6 +18,11 @@ RUN rm -rf .git RUN apt-get install -y openjdk-11-jdk-headless -CMD ls -la && cd build/ && /wait-for-it.sh caosdb-server:10443 -t 500 -- \ - # ... and run tests - cmake .. && cmake --build . && ctest +# build and run tests +CMD ls -la && \ + mkdir build && \ + cd build && \ + /wait-for-it.sh caosdb-server:10443 -t 500 -- \ + cmake -D CMAKE_PREFIX_PATH=/usr/local/lib/libcaosdb-${CPPLIB_VERSION} .. && \ + cmake --build . && \ + ctest diff --git a/.docker/tester.yml b/.docker/tester.yml index 383bad2f07a0471066472857a68ccc331906f076..1673eed239866d774a570c752c984e7fc35cc0df 100644 --- a/.docker/tester.yml +++ b/.docker/tester.yml @@ -5,9 +5,6 @@ services: networks: - docker_caosnet volumes: - - type: bind - source: ../build - target: /caosdb-cppinttest/build - type: bind source: ./cert target: /cert diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6c63c0fe2ff0566a4fce88d3d353465b3c9573da..f71fc76258bde47dca4d88b2191522fe4eb16e77 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -116,10 +116,6 @@ build-test: - cd build - cmake -D CMAKE_PREFIX_PATH=/usr/local/lib/libcaosdb-${CPPLIB_VERSION} .. - cmake --build . - artifacts: - paths: - - build/ - expire_in: 1 week test: @@ -134,8 +130,6 @@ test: stage: test image: $CI_REGISTRY_IMAGE_BASE needs: - - job: build-test - artifacts: true - job: cert artifacts: true script: