updated nginx tests

.gitlab-ci.yml

@@ -72,7 +72,6 @@ release:php:latest:
   stage: php-release
   only:
     - latest
-    - tags
   script:
     - docker login --username ${REGISTRY_USER} --password ${REGISTRY_PASS} ${REGISTRY_HOST}
     - docker tag ${STACK_PHP_IMAGE} ${REGISTRY_PHP_IMAGE_LATEST}
@@ -105,19 +104,20 @@ build:php-alpine-nginx:
     - cd nginx
     - docker-compose build --pull php-alpine-nginx
 
+test:php-nginx:
+  stage: nginx-test
+  script:
+    - docker-compose run --rm php-nginx nginx -v
+
 test:php-alpine-nginx:
   stage: nginx-test
   script:
-    - sh test/prod.sh
-    - sh test/dev.sh
-    - sh test/debug.sh
     - docker-compose run --rm php-alpine-nginx nginx -v
 
 release:nginx:latest:
   stage: nginx-release
   only:
     - latest
-    - tags
   script:
     - docker login --username ${REGISTRY_USER} --password ${REGISTRY_PASS} ${REGISTRY_HOST}
     - docker tag ${STACK_PHP_IMAGE}-nginx ${REGISTRY_PHP_IMAGE_LATEST}-nginx
@@ -125,7 +125,7 @@ release:nginx:latest:
     - docker tag ${STACK_PHP_IMAGE}-alpine-nginx ${REGISTRY_PHP_IMAGE_LATEST}-alpine-nginx
     - docker push ${REGISTRY_PHP_IMAGE_LATEST}-alpine-nginx
 
-release:nginx:tag:
+release:nginx:tags:
   stage: nginx-release
   only:
     - tags

test/debug.sh

@@ -3,15 +3,16 @@
 PHP_SERVICE=${PHP_SERVICE-php}
 
 echo "Running one-off command with xdebug"
-docker-compose run -e PHP_ENABLE_XDEBUG=1 ${PHP_SERVICE} php -i | grep xdebug
+PHP_ENABLE_XDEBUG=1 docker-compose run ${PHP_SERVICE} php -i | grep xdebug
 
+echo ""
 echo "Starting stack with xdebug"
 PHP_ENABLE_XDEBUG=1 docker-compose up -d ${PHP_SERVICE}
 sleep 5
 docker-compose exec ${PHP_SERVICE} php -i -- | grep xdebug
 docker-compose down -v
 
-
+echo ""
 echo "Starting stack without xdebug"
 PHP_ENABLE_XDEBUG=0 docker-compose up -d ${PHP_SERVICE}
 sleep 5