diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad081f6e46e9c9f8c7e18b22d76d94311050c8e1..b8f08db4ffec142a7ae42521c77a703ac60fa1ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,8 +23,8 @@ composer: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker pull $TEST_IMAGE - docker network ls -f name=rekall || docker network create rekall - - [ `docker ps -a -f name=mysql | wc -l` -gt 1 ] && docker rm mysql - - [ `docker ps -a -f name=rekall | wc -l` -gt 1 ] && docker rm rekall + - docker ps -a -f name=mysql | grep mysql && docker rm mysql || true + - docker ps -a -f name=rekall | grep mysql && docker rm rekall || true rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "web"' - if: '$CI_COMMIT_MESSAGE =~ /test/'