mirror of https://github.com/MISP/MISP
chg: test mode for container (only runs tests)
parent
6531e5ab7f
commit
607b4c9257
|
@ -21,7 +21,7 @@ jobs:
|
|||
run: docker-compose -f docker-compose.yml -f docker-compose.dev.yml --env-file="./docker/.env.test" build
|
||||
|
||||
- name: Run tests
|
||||
run: docker-compose -f docker-compose.yml -f docker-compose.dev.yml --env-file="./docker/.env.test" run --entrypoint vendor/bin/phpunit misp
|
||||
run: docker-compose -f docker-compose.yml -f docker-compose.dev.yml --env-file="./docker/.env.test" run misp
|
||||
|
||||
- name: Stop containers
|
||||
run: docker-compose -f docker-compose.yml -f docker-compose.dev.yml --env-file="./docker/.env.test" down --remove-orphans --volumes
|
||||
|
|
|
@ -28,8 +28,6 @@ services:
|
|||
ADMIN_ORG: ${ADMIN_ORG:-ORGNAME}
|
||||
ADMIN_EMAIL: ${ADMIN_EMAIL:-admin@admin.test}
|
||||
ADMIN_INITIAL_PASSWORD: ${ADMIN_INITIAL_PASSWORD:-admin}
|
||||
XDEBUG_MODE: "debug"
|
||||
XDEBUG_SESSION: 1
|
||||
|
||||
webserver:
|
||||
volumes:
|
||||
|
|
|
@ -10,6 +10,7 @@ services:
|
|||
tty: true
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
ENV: ${ENV}
|
||||
MISP_DB: ${MYSQL_DATABASE:-misp}
|
||||
MISP_DB_USER: ${MYSQL_USER:-misp}
|
||||
MISP_DB_PASSWORD: ${MYSQL_PASSWORD}
|
||||
|
|
|
@ -160,5 +160,10 @@ else
|
|||
supervisorctl start misp-workers:*
|
||||
fi
|
||||
|
||||
echo >&2 "Starting php-fpm..."
|
||||
exec php-fpm -F "$@"
|
||||
if [ "$ENV" = "test" ]; then
|
||||
echo >&2 "Running tests..."
|
||||
vendor/bin/phpunit
|
||||
else
|
||||
echo >&2 "Starting php-fpm..."
|
||||
exec php-fpm -F "$@"
|
||||
fi
|
||||
|
|
Loading…
Reference in New Issue