Merge branch 'master' into issue/18-php-7.2

# Conflicts:
#	.travis.yml
This commit is contained in:
Paolo Cuffiani
2017-10-18 18:31:10 +02:00
3 changed files with 81 additions and 114 deletions
+29 -48
View File
@@ -5,13 +5,6 @@ PARENT_IMAGE := php
IMAGE := chialab/php
VERSION ?= latest
# Tags.
TAGS := $(VERSION)
ifneq ($(VERSION),latest)
# Add `-apache` and `-fpm` suffix.
TAGS += $(VERSION)-apache $(VERSION)-fpm
endif
# Extensions.
EXTENSIONS := \
bcmath \
@@ -39,48 +32,36 @@ ifeq ($(VERSION),$(filter 5.5 5.6 7.0 7.1 7.2 latest, $(VERSION)))
EXTENSIONS += OPcache
endif
pull:
@for tag in $(TAGS); do \
docker pull $(PARENT_IMAGE):$${tag}; \
done
build-nopull:
@for tag in $(TAGS); do \
echo " =====> Building $(IMAGE):$${tag}..."; \
dir="$${tag/-//}"; \
if [[ "$${tag}" == 'latest' ]]; then \
dir='.'; \
fi; \
docker build --quiet -t $(IMAGE):$${tag} $${dir}; \
done
build: pull build-nopull
build:
@echo " =====> Building $(IMAGE):$(VERSION)..."
@dir="$(subst -,/,$(VERSION))"; \
if [[ "$(VERSION)" == 'latest' ]]; then \
dir='.'; \
fi; \
docker build --quiet -t $(IMAGE):$(VERSION) $${dir}
test:
@echo 'Testing loaded extensions...'
@for tag in $(TAGS); do \
echo -e " - $${tag}... \c"; \
if [[ -z `docker images $(IMAGE) | grep "\s$${tag}\s"` ]]; then \
echo 'FAIL [Missing image!!!]'; \
@echo -e "=====> Testing loaded extensions... \c"
@if [[ -z `docker images $(IMAGE) | grep "\s$(VERSION)\s"` ]]; then \
echo 'FAIL [Missing image!!!]'; \
exit 1; \
fi
@modules=`docker run --rm $(IMAGE):$(VERSION) php -m`; \
for ext in $(EXTENSIONS); do \
if [[ "$${modules}" != *"$${ext}"* ]]; then \
echo "FAIL [$${ext}]"; \
exit 1; \
fi; \
modules=`docker run --rm $(IMAGE):$${tag} php -m`; \
for ext in $(EXTENSIONS); do \
if [[ "$${modules}" != *"$${ext}"* ]]; then \
echo "FAIL [$${ext}]"; \
exit 1; \
fi \
done; \
if [[ "$${tag}" == *'-apache' ]]; then \
apache=`docker run --rm $(IMAGE):$${tag} apache2ctl -M 2> /dev/null`; \
if [[ "$${apache}" != *'rewrite_module'* ]]; then \
echo 'FAIL [mod_rewrite]'; \
exit 1; \
fi \
fi; \
if [[ -z `docker run --rm $(IMAGE):$${tag} composer --version 2> /dev/null | grep '^Composer version [0-9][0-9]*\.[0-9][0-9]*'` ]]; then \
echo 'FAIL [Composer]'; \
exit 1; \
fi; \
echo 'OK'; \
fi \
done
@if [[ "$(VERSION)" == *'-apache' ]]; then \
apache=`docker run --rm $(IMAGE):$(VERSION) apache2ctl -M 2> /dev/null`; \
if [[ "$${apache}" != *'rewrite_module'* ]]; then \
echo 'FAIL [mod_rewrite]'; \
exit 1; \
fi \
fi
@if [[ -z `docker run --rm $(IMAGE):$(VERSION) composer --version 2> /dev/null | grep '^Composer version [0-9][0-9]*\.[0-9][0-9]*'` ]]; then \
echo 'FAIL [Composer]'; \
exit 1; \
fi
@echo 'OK'