Merge branch 'f-fix-f-branch-pipeline' into 'dev'

Fix pipeline for f-branches

See merge request !30

.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" && \

.gitlab-ci.yml

@@ -78,16 +78,12 @@ build-testenv: &build-testenv
   stage: setup
   timeout: 2h
   needs: []
-  only:
-    - pipelines
-    - schedules
-    - web
   script:
     - *env
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
 
       #build testenv image
-    - docker pull $CPPLIB_REGISTRY_IMAGE || { CPPLIB_REGISTRY_IMAGE="$CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:dev" ; docker pull $CPPLIB_REGISTRY_IMAGE ; }
+    - docker pull $CPPLIB_REGISTRY_IMAGE || { CPPLIB_REGISTRY_IMAGE="$CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:dev" ; echo "Using cpplib@dev instead."; docker pull $CPPLIB_REGISTRY_IMAGE ; }
     - docker build
       --build-arg CPPLIB_REGISTRY_IMAGE=$CPPLIB_REGISTRY_IMAGE
       --file .docker/Dockerfile