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

#18 fix: fix Makefile tests

Browse Source
This commit is contained in:
Paolo Cuffiani
2017-12-04 14:30:38 +01:00
parent ebe0f8b45b
commit 32abb0730d
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+4 -3
View File
@@ -4,6 +4,7 @@ SHELL := /bin/bash
PARENT_IMAGE := php
IMAGE := chialab/php
VERSION ?= latest
PHP_VERSION = $(firstword $(subst -, ,$(VERSION)))
# Extensions.
EXTENSIONS := \
@@ -22,15 +23,15 @@ EXTENSIONS := \
redis \
soap \
zip
ifneq ($(VERSION),$(filter 7.2 latest, $(VERSION)))
ifeq (,$(findstring $(PHP_VERSION), 7.2 latest))
# Add more extensions to PHP < 7.2.
EXTENSIONS += mcrypt
endif
ifneq ($(VERSION),$(filter 7.0 7.1 7.2 latest, $(VERSION)))
ifeq (,$(findstring $(PHP_VERSION), 7.0 7.1 7.2 latest))
# Add more extensions to 5.x series images.
EXTENSIONS += mysql
endif
ifeq ($(VERSION),$(filter 5.5 5.6 7.0 7.1 7.2 latest, $(VERSION)))
ifneq (,$(findstring $(PHP_VERSION), 5.5 5.6 7.0 7.1 7.2 latest))
# Add OPCache check to PHP version with Zend OPCache.
EXTENSIONS += OPcache
endif
dev/Makefile
+3 -2
View File
@@ -4,6 +4,7 @@ SHELL := /bin/bash
PARENT_IMAGE := chialab/php
IMAGE := chialab/php-dev
VERSION ?= latest
PHP_VERSION = $(firstword $(subst -, ,$(VERSION)))
# Extensions.
EXTENSIONS := \
@@ -23,11 +24,11 @@ EXTENSIONS := \
soap \
Xdebug \
zip
ifneq ($(VERSION),$(filter 7.0 7.1 latest, $(VERSION)))
ifeq (,$(findstring $(PHP_VERSION), 7.0 7.1 7.2 latest))
# Add more extensions to 5.x series images.
EXTENSIONS += mysql
endif
ifeq ($(VERSION),$(filter 5.5 5.6 7.0 7.1 latest, $(VERSION)))
ifneq (,$(findstring $(PHP_VERSION), 5.5 5.6 7.0 7.1 7.2 latest))
# Add OPCache check to PHP version with Zend OPCache.
EXTENSIONS += OPcache
endif