diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7da5843ed4fb7ca7914bc76667565804125bf2c2..bd6d8e06cc482953fd339fd87442c82c64531c03 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ variables: CONTAINER_IMAGE: portus.lam.fr/anis/anis-server install: - image: jakzal/phpqa + image: jakzal/phpqa:php7.4 stage: install script: - composer install --ignore-platform-reqs @@ -24,7 +24,7 @@ install: - develop phpunit: - image: jakzal/phpqa + image: jakzal/phpqa:php7.4 stage: test script: - phpdbg -qrr ./vendor/bin/phpunit --bootstrap ./tests/bootstrap.php --whitelist src --coverage-clover ./coverage/clover.xml --log-junit ./coverage/junit-logfile.xml --colors=never ./tests diff --git a/Makefile b/Makefile index 29a216f6f3169130af2fba2ba51235356979ba5b..a601c9c43db0ae92e0f0544fd400548c108c3e2b 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ install: @docker run --init -it --rm --user $(UID):$(GID) \ -e COMPOSER_CACHE_DIR=/dev/null \ -v $(CURDIR):/project \ - -w /project jakzal/phpqa composer install --ignore-platform-reqs + -w /project jakzal/phpqa:php7.4 composer install --ignore-platform-reqs rebuild: @docker-compose up --build -d @@ -49,13 +49,13 @@ shell: phpunit: @docker run --init -it --rm --user $(UID):$(GID) \ -v $(CURDIR):/project \ - -w /project jakzal/phpqa phpdbg -qrr ./vendor/bin/phpunit --bootstrap ./tests/bootstrap.php \ + -w /project jakzal/phpqa:php7.4 phpdbg -qrr ./vendor/bin/phpunit --bootstrap ./tests/bootstrap.php \ --whitelist src --colors --coverage-html ./phpunit-coverage ./tests phpcs: @docker run --init -it --rm --user $(UID):$(GID) \ -v $(CURDIR):/project \ - -w /project jakzal/phpqa phpcs --standard=PSR12 --extensions=php --colors src tests + -w /project jakzal/phpqa:php7.4 phpcs --standard=PSR12 --extensions=php --colors src tests create-db: @docker-compose exec php sh ./conf-dev/init-keycloak.sh