Fix grep regex-es.

This commit is contained in:
Paolo Cuffiani
2015-11-13 18:10:40 +01:00
parent 40f1428fad
commit 97a29e2058
2 changed files with 9 additions and 9 deletions
+3 -3
View File
@@ -43,7 +43,7 @@ pull:
build-nopull:
@for tag in $(TAGS); do \
dir="$${tag/-//}"; \
if [ "$${tag}" = 'latest' ]; then \
if [[ "$${tag}" == 'latest' ]]; then \
dir='.'; \
fi; \
echo " =====> Building $(IMAGE):$${tag}..."; \
@@ -67,7 +67,7 @@ test:
exit 1; \
fi \
done; \
if [[ "$${tag}" = *'-apache' ]]; then \
if [[ "$${tag}" == *'-apache' ]]; then \
apache=`docker run --rm $(IMAGE):$${tag} apache2ctl -M 2> /dev/null`; \
if [[ "$${apache}" != *'rewrite_module'* ]]; then \
echo 'FAIL [mod_rewrite]'; \
@@ -75,7 +75,7 @@ test:
fi \
fi; \
if [[ "$${tag}" != *'-apache' ]] && [[ "$${tag}" != *'-fpm' ]]; then \
if [[ -z `docker run --rm $(IMAGE):$${tag} composer --version | grep '^Composer version \d\d*\.\d\d*'` ]]; then \
if [[ -z `docker run --rm $(IMAGE):$${tag} composer --version | grep '^Composer version [0-9][0-9]*\.[0-9][0-9]*'` ]]; then \
echo 'FAIL [Composer]'; \
exit 1; \
fi \
+6 -6
View File
@@ -41,7 +41,7 @@ pull:
build-nopull:
@for tag in $(TAGS); do \
dir="$${tag/-//}"; \
if [ "$${tag}" = 'latest' ]; then \
if [[ "$${tag}" == 'latest' ]]; then \
dir='.'; \
fi; \
echo " =====> Building $(IMAGE):$${tag}..."; \
@@ -65,7 +65,7 @@ test:
exit 1; \
fi \
done; \
if [[ "$${tag}" = *'-apache' ]]; then \
if [[ "$${tag}" == *'-apache' ]]; then \
apache=`docker run --rm $(IMAGE):$${tag} apache2ctl -M 2> /dev/null`; \
if [[ "$${apache}" != *'rewrite_module'* ]]; then \
echo 'FAIL [mod_rewrite]'; \
@@ -73,19 +73,19 @@ test:
fi \
fi; \
if [[ "$${tag}" != *'-apache' ]] && [[ "$${tag}" != *'-fpm' ]]; then \
if [[ -z `docker run --rm $(IMAGE):latest composer --version | grep '^Composer version \d\d*\.\d\d*'` ]]; then \
if [[ -z `docker run --rm $(IMAGE):latest composer --version | grep '^Composer version [0-9][0-9]*\.[0-9][0-9]*'` ]]; then \
echo 'FAIL [Composer]'; \
exit 1; \
fi; \
if [[ -z `docker run --rm $(IMAGE):latest phpcs --version | grep '^PHP_CodeSniffer version \d\d*\.\d\d*\.\d\d*'` ]]; then \
if [[ -z `docker run --rm $(IMAGE):latest phpcs --version | grep '^PHP_CodeSniffer version [0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*'` ]]; then \
echo 'FAIL [PHP_CodeSniffer]'; \
exit 1; \
fi; \
if [[ -z `docker run --rm $(IMAGE):latest phpmd --version | grep '^PHPMD \d\d*\.\d\d*\.\d\d*'` ]]; then \
if [[ -z `docker run --rm $(IMAGE):latest phpmd --version | grep '^PHPMD [0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*'` ]]; then \
echo 'FAIL [PHPMD]'; \
exit 1; \
fi; \
if [[ -z `docker run --rm $(IMAGE):latest phpunit --version | grep '^PHPUnit \d\d*\.\d\d*\.\d\d*'` ]]; then \
if [[ -z `docker run --rm $(IMAGE):latest phpunit --version | grep '^PHPUnit [0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*'` ]]; then \
echo 'FAIL [PHPUnit]'; \
exit 1; \
fi \