diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 98f12aabb4ddf22f9375c97669e025adaed6b627..29e439b0a97505591a74e2407ba17bcc584f45e4 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -15,7 +15,8 @@ RUN rm -rf .git 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 CMD mkdir build && \ cd build && \ conan install .. -s "compiler.libcxx=libstdc++11" && \ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8027befbc7deb93168a888f7c3354685eb661f81..00797c53d4f20e13bf253acc4ff9cb2be431a43d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,10 +78,10 @@ build-testenv: &build-testenv stage: setup timeout: 2h needs: [] - only: - - pipelines - - schedules - - web + # only: + # - pipelines + # - schedules + # - web script: - *env - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY