starred/docker-php
1
0
Fork 0
mirror of https://github.com/chialab/docker-php.git synced 2026-08-24 10:13:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Update Makefile. Use single square bracket syntax."

Browse Source 
This reverts commit cb762e1962.

# Conflicts:
#	Makefile
#	dev/Makefile
This commit is contained in:
Paolo Cuffiani
2015-11-13 15:22:42 +01:00
parent 031d38cd9f
commit 589d29d01c
2 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+6 -8
View File
@@ -56,28 +56,26 @@ test:
@echo 'Testing loaded extensions...'
@for tag in $(TAGS); do \
echo " - $${tag}... \c"; \
test=`docker images $(IMAGE) | grep "\s$${tag}\s"`; \
if [ -z "$${test}" ]; then \
if [[ -z `docker images $(IMAGE) | grep "\s$${tag}\s"` ]]; then \
echo 'FAIL [Missing image!!!]'; \
exit 1; \
fi; \
modules=`docker run --rm $(IMAGE):$${tag} php -m`; \
for ext in $(EXTENSIONS); do \
if ([ "$${tag:0:1}" != '7' ] || [ "$${NO_PHP_7/$$ext}" = "$(NO_PHP_7)" ]) && [ "$${modules/$$ext}" = "$${modules}" ]; then \
if ([[ "$${tag}" != '7'* ]] || [[ "$(NO_PHP_7)" != *"$${ext}"* ]]) && [[ "$${modules}" != *"$${ext}"* ]]; then \
echo "FAIL [$${ext}]"; \
exit 1; \
fi \
done; \
if [ "$${tag/'-apache'}" != "$${tag}" ]; then \
if [[ "$${tag}" = *'-apache' ]]; then \
apache=`docker run --rm $(IMAGE):$${tag} apache2ctl -M 2> /dev/null`; \
if [ "$${apache/'rewrite_module'}" = "$${apache}" ]; then \
if [[ "$${apache}" != *'rewrite_module'* ]]; then \
echo 'FAIL [mod_rewrite]'; \
exit 1; \
fi \
fi; \
if [ "$${tag/'-apache'}" = "$${tag}" ] && [ "$${tag/'-fpm'}" = "$${tag}" ]; then \
test=`docker run --rm $(IMAGE):$${tag} composer --version | grep '^Composer version \d\d*\.\d\d*'`; \
if [ -z "$${test}" ]; then \
if [[ "$${tag}" != *'-apache' ]] && [[ "$${tag}" != *'-fpm' ]]; then \
if [[ -z `docker run --rm $(IMAGE):$${tag} composer --version | grep '^Composer version \d\d*\.\d\d*'` ]]; then \
echo 'FAIL [Composer]'; \
exit 1; \
fi \
dev/Makefile
+9 -14
View File
@@ -54,43 +54,38 @@ test:
@echo 'Testing loaded extensions...'
@for tag in $(TAGS); do \
echo " - $${tag}... \c"; \
test=`docker images $(IMAGE) | grep "\s$${tag}\s"`; \
if [ -z "$${test}" ]; then \
if [[ -z `docker images $(IMAGE) | grep "\s$${tag}\s"` ]]; then \
echo 'FAIL [Missing image!!!]'; \
exit 1; \
fi; \
modules=`docker run --rm $(IMAGE):$${tag} php -m`; \
for ext in $(EXTENSIONS); do \
if ([ "$${tag:0:1}" != '7' ] || [ "$${NO_PHP_7/$$ext}" = "$(NO_PHP_7)" ]) && [ "$${modules/$$ext}" = "$${modules}" ]; then \
if ([[ "$${tag}" != '7'* ]] || [[ "$(NO_PHP_7)" != *"$${ext}"* ]]) && [[ "$${modules}" != *"$${ext}"* ]]; then \
echo "FAIL [$${ext}]"; \
exit 1; \
fi \
done; \
if [ "$${tag/'-apache'}" != "$${tag}" ]; then \
if [[ "$${tag}" = *'-apache' ]]; then \
apache=`docker run --rm $(IMAGE):$${tag} apache2ctl -M 2> /dev/null`; \
if [ "$${apache/'rewrite_module'}" = "$${apache}" ]; then \
if [[ "$${apache}" != *'rewrite_module'* ]]; then \
echo 'FAIL [mod_rewrite]'; \
exit 1; \
fi \
fi; \
if [ "$${tag/'-apache'}" = "$${tag}" ] && [ "$${tag/'-fpm'}" = "$${tag}" ]; then \
test=`docker run --rm $(IMAGE):latest composer --version | grep '^Composer version \d\d*\.\d\d*'`; \
if [ -z "$${test}" ]; then \
if [[ "$${tag}" != *'-apache' ]] && [[ "$${tag}" != *'-fpm' ]]; then \
if [[ -z `docker run --rm $(IMAGE):latest composer --version | grep '^Composer version \d\d*\.\d\d*'` ]]; then \
echo 'FAIL [Composer]'; \
exit 1; \
fi; \
test=`docker run --rm $(IMAGE):latest phpcs --version | grep '^PHP_CodeSniffer version \d\d*\.\d\d*\.\d\d*'`; \
if [ -z "$${test}" ]; then \
if [[ -z `docker run --rm $(IMAGE):latest phpcs --version | grep '^PHP_CodeSniffer version \d\d*\.\d\d*\.\d\d*'` ]]; then \
echo 'FAIL [PHP_CodeSniffer]'; \
exit 1; \
fi; \
test=`docker run --rm $(IMAGE):latest phpmd --version | grep '^PHPMD \d\d*\.\d\d*\.\d\d*'`; \
if [ -z "$${test}" ]; then \
if [[ -z `docker run --rm $(IMAGE):latest phpmd --version | grep '^PHPMD \d\d*\.\d\d*\.\d\d*'` ]]; then \
echo 'FAIL [PHPMD]'; \
exit 1; \
fi; \
test=`docker run --rm $(IMAGE):latest phpunit --version | grep '^PHPUnit \d\d*\.\d\d*\.\d\d*'`; \
if [ -z "$${test}" ]; then \
if [[ -z `docker run --rm $(IMAGE):latest phpunit --version | grep '^PHPUnit \d\d*\.\d\d*\.\d\d*'` ]]; then \
echo 'FAIL [PHPUnit]'; \
exit 1; \
fi \