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

# Conflicts: # .travis.yml
2026-08-24 02:24:16 -05:00 · 2017-10-18 18:31:10 +02:00
parent 08419d452b 6053f46d94
commit 0969810641
3 changed files with 81 additions and 114 deletions
@@ -6,25 +6,30 @@ services:
  - docker

 env:
-  - DIR=.    VERSION=latest
-  - DIR=.    VERSION=5.4
-  - DIR=.    VERSION=5.5
-  - DIR=.    VERSION=5.6
-  - DIR=.    VERSION=7.0
-  - DIR=.    VERSION=7.1
-  - DIR=.    VERSION=7.2
-  - DIR=dev/ VERSION=latest
-  - DIR=dev/ VERSION=5.5
-  - DIR=dev/ VERSION=5.6
-  - DIR=dev/ VERSION=7.0
-  - DIR=dev/ VERSION=7.1
-  - DIR=dev/ VERSION=7.2
-
-before_install:
- make -C ${DIR} pull VERSION=${VERSION}
+  - VERSION=latest
+  - VERSION=5.4 NO_DEV=1
+  - VERSION=5.4-apache NO_DEV=1
+  - VERSION=5.4-fpm NO_DEV=1
+  - VERSION=5.5
+  - VERSION=5.5-apache
+  - VERSION=5.5-fpm
+  - VERSION=5.6
+  - VERSION=5.6-apache
+  - VERSION=5.6-fpm
+  - VERSION=7.0
+  - VERSION=7.0-apache
+  - VERSION=7.0-fpm
+  - VERSION=7.1
+  - VERSION=7.1-apache
+  - VERSION=7.1-fpm
+  - VERSION=7.2
+  - VERSION=7.2-apache
+  - VERSION=7.2-fpm

 install:
- travis_wait 30 make -C ${DIR} build-nopull VERSION=${VERSION}
+- travis_wait 30 make build VERSION=${VERSION}
+- if [ "$NO_DEV" != "1" ]; then travis_wait 30 make -C dev build VERSION=${VERSION}; fi

 script:
- make -C ${DIR} test VERSION=${VERSION}
+- make test VERSION=${VERSION}
+- if [ "$NO_DEV" != "1" ]; then travis_wait 30 make -C dev test VERSION=${VERSION}; fi
@@ -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'
@@ -5,13 +5,6 @@ PARENT_IMAGE := chialab/php
 IMAGE := chialab/php-dev
 VERSION ?= latest

-# Tags.
-TAGS := $(VERSION)
-ifneq ($(VERSION),latest)
-	# Add `-apache` and `-fpm` suffix.
-	TAGS += $(VERSION)-apache $(VERSION)-fpm
-endif
-
 # Extensions.
 EXTENSIONS := \
 	bcmath \
@@ -40,48 +33,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'