Commit 068e78b6 authored by Auke Klazema's avatar Auke Klazema

TMSS-143: Combine TMSS build and docker

parent 1cbe57dd
......@@ -52,16 +52,7 @@ build_TMSS:
- cmake -DBUILD_PACKAGES=$PACKAGE -DCASACORE_ROOT_DIR=/opt/casacore/ -DCASAREST_ROOT_DIR=/opt/casarest/ -DCMAKE_INSTALL_PREFIX=/opt/lofar -DUSE_LOG4CPLUS=false ../..
- make -j 6
- make DESTDIR=../../install install
dependencies:
- prepare_RAServices
artifacts:
expire_in: 6 hours
paths:
- install
build_TMSS_docker:
stage: build
script:
- cd ../..
- cd install
- docker build -t tmss_django:$CI_COMMIT_SHORT_SHA -f docker/Dockerfile-tmss .
- cd ..
......@@ -74,7 +65,11 @@ build_TMSS_docker:
- docker push nexus.cep4.control.lofar:18080/tmss_testprovider:$CI_COMMIT_SHORT_SHA
- docker logout $CI_NEXUS_REGISTRY
dependencies:
- build_TMSS
- prepare_RAServices
artifacts:
expire_in: 6 hours
paths:
- install
#
# UNIT TEST STAGE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment