feat: упрощение тестового окружения

Author: wyster

.docker/.env.dist

@@ -1,3 +1,4 @@
+PROJECT_NAME=symfony-based-phone-checker
 HTTP_PORT=80
 
 PHP_VERSION=7.4

.docker/.env.testing

@@ -0,0 +1 @@
+ENABLE_XDEBUG=1

.docker/Makefile

@@ -37,7 +37,19 @@ setup:
 	@cp -n docker-compose.override.yml.dist docker-compose.override.yml
 
 tests: setup
-	@cd ./tests && make run
+	@docker-compose -p ${PROJECT_NAME}_testing -f docker-compose.yml -f docker-compose.testing.yml up -d
+	@docker-compose -p ${PROJECT_NAME}_testing exec -T web bash /wait-for.sh --timeout=30 localhost:80 -- echo "Webserver started"
+	@docker-compose -p ${PROJECT_NAME}_testing exec -T php ./vendor/bin/codecept run
+	@docker-compose -p ${PROJECT_NAME}_testing stop
 
 coverage: setup
-	@cd ./tests && make coverage
+	@docker-compose -p ${PROJECT_NAME}_testing -f docker-compose.yml -f docker-compose.testing.yml up -d
+	@docker-compose -p ${PROJECT_NAME}_testing exec -T web bash /wait-for.sh --timeout=30 localhost:80 -- echo "Webserver started"
+	@docker-compose -p ${PROJECT_NAME}_testing exec -T php ./vendor/bin/codecept run --coverage --coverage-xml
+	@docker-compose -p ${PROJECT_NAME}_testing stop
+
+ci: setup
+	@docker-compose -p ${PROJECT_NAME}_testing -f docker-compose.yml -f docker-compose.testing.yml up -d
+	@docker-compose -p ${PROJECT_NAME}_testing exec -T web bash /wait-for.sh --timeout=30 localhost:80 -- echo "Webserver started"
+	@docker-compose -p ${PROJECT_NAME}_testing exec -T php ./vendor/bin/grumphp run --testsuite=ci
+	@docker-compose -p ${PROJECT_NAME}_testing stop

.docker/docker-compose.testing.yml

@@ -0,0 +1,16 @@
+version: "3"
+services:
+  web:
+    container_name: ${PROJECT_NAME}_web_testing
+    env_file:
+      - ".env.testing"
+  php:
+    container_name: ${PROJECT_NAME}_php_testing
+    env_file:
+      - ".env.testing"
+  mysql:
+    container_name: ${PROJECT_NAME}_mysql_testing
+    volumes:
+      - "./data/testing/mysql:/var/lib/mysql"
+    env_file:
+      - ".env.testing"

.docker/nginx/start.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 echo 'Run start.sh'
 
-bash /wait-for.sh php:9000 -t 0 -- echo "Php fpm started"
+bash /wait-for.sh php:9000 --timeout=30 -- echo "Php fpm started"
 
 nginx -g 'daemon off;'

.docker/nginx/wait-for.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#   Use this script to test if a given TCP host/port are available
+# Use this script to test if a given TCP host/port are available
 
 WAITFORIT_cmdname=${0##*/}
 
@@ -141,16 +141,20 @@ WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
 WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
 WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
 
-# check to see if timeout is from busybox?
+# Check to see if timeout is from busybox?
 WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
 WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
+
+WAITFORIT_BUSYTIMEFLAG=""
 if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
-        WAITFORIT_ISBUSY=1
+    WAITFORIT_ISBUSY=1
+    # Check if busybox timeout uses -t flag
+    # (recent Alpine versions don't support -t anymore)
+    if timeout &>/dev/stdout | grep -q -e '-t '; then
         WAITFORIT_BUSYTIMEFLAG="-t"
-
+    fi
 else
-        WAITFORIT_ISBUSY=0
-        WAITFORIT_BUSYTIMEFLAG=""
+    WAITFORIT_ISBUSY=0
 fi
 
 if [[ $WAITFORIT_CHILD -gt 0 ]]; then

.docker/php/start.sh

@@ -9,7 +9,7 @@ if [ $ENABLE_XDEBUG == "1" ]; then
     docker-php-ext-enable xdebug
 fi
 
-bash /wait-for.sh mysql:3306 -t 0 -- echo "Mysql started"
+bash /wait-for.sh mysql:3306 --timeout=30 -- echo "Mysql started"
 
 php ./bin/console doctrine:migrations:migrate --no-interaction
 

.docker/php/wait-for.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#   Use this script to test if a given TCP host/port are available
+# Use this script to test if a given TCP host/port are available
 
 WAITFORIT_cmdname=${0##*/}
 
@@ -141,16 +141,20 @@ WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
 WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
 WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
 
-# check to see if timeout is from busybox?
+# Check to see if timeout is from busybox?
 WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
 WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
+
+WAITFORIT_BUSYTIMEFLAG=""
 if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
-        WAITFORIT_ISBUSY=1
+    WAITFORIT_ISBUSY=1
+    # Check if busybox timeout uses -t flag
+    # (recent Alpine versions don't support -t anymore)
+    if timeout &>/dev/stdout | grep -q -e '-t '; then
         WAITFORIT_BUSYTIMEFLAG="-t"
-
+    fi
 else
-        WAITFORIT_ISBUSY=0
-        WAITFORIT_BUSYTIMEFLAG=""
+    WAITFORIT_ISBUSY=0
 fi
 
 if [[ $WAITFORIT_CHILD -gt 0 ]]; then

.docker/tests/.env.dist

@@ -14,4 +14,4 @@ jobs:
       run: composer install --prefer-dist --no-progress --no-suggest --no-scripts
 
     - name: Grumphp
-      run: cd .docker/tests && make up && docker-compose exec -T php ./vendor/bin/grumphp run --testsuite=ci
+      run: cd .docker && make ci

.docker/tests/Makefile

@@ -30,18 +30,18 @@ parameters:
         priority: 300
     git_commit_message:
       enforce_capitalized_subject: false
-      type_scope_conventions:
-        - types:
-            - build
-            - ci
-            - chore
-            - docs
-            - feat
-            - fix
-            - perf
-            - refactor
-            - test
-        - scopes: []
+    type_scope_conventions:
+      - types:
+          - build
+          - ci
+          - chore
+          - docs
+          - feat
+          - fix
+          - perf
+          - refactor
+          - test
+      - scopes: []
     phpstan:
       ignore_patterns: [src/Migrations]
     phplint: ~