diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 4ac1cc71e27a69481baeade25f35d437e425bbfb..1fcb1d7a01548eb2ebd583594351ae2d6ccde544 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -12,6 +12,7 @@ RUN cmake --build . RUN cmake --install . --prefix /usr/local/ +WORKDIR /cppinttest/ CMD /wait-for-it.sh caosdb-server:10443 -t 500 -- \ # ... and run tests ctest diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f5e147a304774a065babba21884430daface48ef..3294982451ba54bcc93f831fea839ac43c10abce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -172,7 +172,7 @@ test: - docker logs docker_sqldb_1 &> ../mariadb_log.txt # shut down - - CAOSDB_TAG=$CAOSDB_TAG docker-compose -f .docker/docker-compose.yml down + - CAOSDB_TAG=$CAOSDB_TAG docker-compose -f docker-compose.yml down # collect results - rc=`cat result`