diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 342403408ae72c2b6e30394b81aa5b2ec87cc55f..8186d9b7ddbaaac97b37355198987cb0fb4f6848 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,13 +37,11 @@ composer: - if: '$CI_COMMIT_MESSAGE =~ /test/' - if: '$CI_COMMIT_BRANCH =~ /test/ || $CI_COMMIT_BRANCH == "production" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' script: - - docker run --rm --name rekall --network rekall -e MYSQL_DATABASE=$MYSQL_DATABASE -e MYSQL_USER=$MYSQL_USER -e MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD -e $MYSQL_PASSWORD=$MYSQL_PASSWORD -v ${CI_PROJECT_DIR}/docker/mysql/init_db_d:/docker-entrypoint-initdb.d -d --name=mysql mysql:5.6 + - docker run --rm --name rekall --network rekall -e MYSQL_DATABASE=$MYSQL_DATABASE -e MYSQL_USER=$MYSQL_USER -e MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD -e MYSQL_PASSWORD=$MYSQL_PASSWORD -v ${CI_PROJECT_DIR}/docker/mysql/init_db_d:/docker-entrypoint-initdb.d -d --name=mysql mysql:5.6 - docker run --rm --network rekall -v ${CI_PROJECT_DIR}:/sites/memorekall/www/web_dev -v /log:/sites/memorekall/www/web_dev/log --entrypoint /sites/memorekall/www/web_dev/tools/ci-job.sh $TEST_IMAGE after_script: - docker stop mysql - - docker rm mysql - docker stop rekall - - docker rm rekall - docker network rm rekall artifacts: when: always