Commit 10fad613 authored by James Kirk's avatar James Kirk
Browse files

Merge branch 'gitlab' into 'dev'

Gitlaaaaab

See merge request !20
include: include:
- project: oceanids/c2/infrastructure/ci-scripts - project: communications-backbone-system/backbone-infrastructure-config
ref: master ref: master
file: python-microservice/all.yml file: gitlab/all.yml
variables: variables:
DOCKER_IMAGE_NAME: backbone-message-format DOCKER_IMAGE_NAME: backbone-message-format
......
...@@ -16,8 +16,8 @@ while [ -n "$1" ]; do ...@@ -16,8 +16,8 @@ while [ -n "$1" ]; do
EXTRA_ARGS="--build" EXTRA_ARGS="--build"
;; ;;
tests) tests)
docker-compose -f docker/docker-compose-test.yaml up --build docker-compose -f docker/docker-compose-test.yaml up --build --force-recreate --abort-on-container-exit --exit-code-from soar_flasgger_test
exit 0 exit $?
;; ;;
*) *)
usage usage
......
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