danog/php
1
0
Fork 0
mirror of https://github.com/danog/php.git synced 2024-12-03 09:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity
397 Commits 1 Branch 0 Tags 3.7 MiB
903540ea79
Commit Graph

397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianon Gravi
47abb34bbf Apply update.sh 2016-05-23 14:29:30 -07:00
Tianon Gravi
d1c1222433 Adjust PHPIZE_DEPS logic slightly for better cross-environment consistency (and to allow for folks to set "PHPIZE_DEPS=" in order to disable the additional behavior) 
Full diff from before this change, to show the impact of this commit slightly more clearly:

```diff
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index c3c3d36..60491a0 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -1,7 +1,7 @@
 FROM alpine:3.3

-# phpize deps
-RUN apk add --no-cache --virtual .phpize-deps \
+# persistent / runtime deps
+ENV PHPIZE_DEPS \
 		autoconf \
 		file \
 		g++ \
@@ -10,8 +10,6 @@ RUN apk add --no-cache --virtual .phpize-deps \
 		make \
 		pkgconf \
 		re2c
-
-# persistent / runtime deps
 RUN apk add --no-cache --virtual .persistent-deps \
 		ca-certificates \
 		curl
@@ -39,6 +37,7 @@ ENV PHP_SHA256 %%PHP_SHA256%%

 RUN set -xe \
 	&& apk add --no-cache --virtual .build-deps \
+		$PHPIZE_DEPS \
 		curl-dev \
 		gnupg \
 		libedit-dev \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index a95b582..397eee5 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -1,7 +1,7 @@
 FROM debian:jessie

-# phpize deps
-RUN apt-get update && apt-get install -y \
+# persistent / runtime deps
+ENV PHPIZE_DEPS \
 		autoconf \
 		file \
 		g++ \
@@ -9,11 +9,9 @@ RUN apt-get update && apt-get install -y \
 		libc-dev \
 		make \
 		pkg-config \
-		re2c \
-	--no-install-recommends && rm -r /var/lib/apt/lists/*
-
-# persistent / runtime deps
+		re2c
 RUN apt-get update && apt-get install -y \
+		$PHPIZE_DEPS \
 		ca-certificates \
 		curl \
 		libedit2 \
diff --git a/docker-php-ext-install b/docker-php-ext-install
index 67180a8..eb2380a 100755
--- a/docker-php-ext-install
+++ b/docker-php-ext-install
@@ -55,6 +55,10 @@ if [ -z "$exts" ]; then
 	exit 1
 fi

+if [ -e /lib/apk/db/installed ] && [ -n "$PHPIZE_DEPS" ]; then
+	apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS
+fi
+
 for ext in $exts; do
 	(
 		cd "$ext"
@@ -69,3 +73,7 @@ for ext in $exts; do
 		make -j"$j" clean
 	)
 done
+
+if [ -e /lib/apk/db/installed ] && [ -n "$PHPIZE_DEPS" ]; then
+	apk del .phpize-deps
+fi
```
 2016-05-23 14:28:40 -07:00
yosifkit
60a7ce3c28 Merge pull request #206 from ncopa/php-ext-install-alpine 
install build time deps from docker-php-ext-install for alpine
 2016-05-20 11:04:36 -07:00
Natanael Copa
1ca3e1d22a Apply update.sh 2016-05-20 16:17:45 +02:00
Natanael Copa
e3db777ec6 Install build time deps from docker-php-ext-install for alpine 
We don't need the build dependencies during runtime, so we temporarily
install them when building extension. This reduces image size with 50%.

We also provide a PHPIZE_DEPS environment variable with the needed deps.
 2016-05-20 16:17:09 +02:00
Tianon Gravi
49ceb8ddbb Apply update.sh 2016-05-17 16:42:35 -07:00
yosifkit
343b7995bc Merge pull request #228 from robbertkl/master 
Avoid cache in Alpine apk add
 2016-05-17 16:13:33 -07:00
Robbert Klarenbeek
85d48c88b3 Avoid cache in Alpine apk add 2016-05-17 22:44:45 +02:00
Tianon Gravi
a783b638e2 Merge pull request #224 from andrerom/php_update 
Update to 5.5.35, 5.6.21, and 7.0.6
 2016-04-29 10:05:07 -07:00
André R
0783dc544c Update php versions 2016-04-29 17:28:28 +02:00
Tianon Gravi
0cd67fcb8d Fix embarassing README.md typo (https://github.com/docker-library/docs/pull/557) 2016-04-26 14:38:11 -07:00
Tianon Gravi
4677ca134f Update to 7.0.5, 5.6.20, 5.5.34 2016-03-31 16:59:32 -07:00
yosifkit
fb53da7e9c Merge pull request #211 from infosiftr/mbstring 
Explicitly enable "mbstring" by default (since certain pecl bits cannot work properly otherwise)
 2016-03-30 14:07:42 -07:00
Tianon Gravi
b694d2529d Explicitly enable "mbstring" by default (since certain pecl bits cannot work properly otherwise) 2016-03-30 09:07:32 -07:00
yosifkit
27a370a6b7 Merge pull request #205 from jlaswell/patch-1 
Update LICENSE Year
 2016-03-21 12:39:56 -07:00
John Laswell
78a658f846 Update LICENSE Year 2016-03-21 08:40:23 -04:00
Tianon Gravi
ac38f614f1 Add Alpine variants to generate-stackbrew-library.sh 2016-03-18 14:37:47 -07:00
Tianon Gravi
3b314af891 Add "travisEnv" bits to update.sh 2016-03-18 13:26:18 -07:00
yosifkit
d7176685df Merge pull request #202 from infosiftr/templatize 
Convert all Dockerfiles to be template-based, and resync a few minor bits of Alpine and Debian (libedit in both, no recode in either, POSIX shell versions of docker-php-ext-* scripts for all)
 2016-03-18 13:25:36 -07:00
Tianon Gravi
0d23b3d087 Apply update.sh 2016-03-18 10:57:54 -07:00
Tianon Gravi
3bf5b82235 Convert all Dockerfiles to be template-based, and resync a few minor bits of Alpine and Debian (libedit in both, no recode in either, POSIX shell versions of docker-php-ext-* scripts for all) 2016-03-18 10:57:31 -07:00
Tianon Gravi
e1ab9ff7bb Merge pull request #176 from ncopa/php-alpine 
add php:7.0-alpine
 2016-03-18 09:55:58 -07:00
Natanael Copa
647490f42c sort dependencies and remove duplicate libxml2-dev in alpine images 2016-03-17 11:38:00 +01:00
Natanael Copa
b9212a0eea upgrade alpine images to 7.0.4 2016-03-17 11:38:00 +01:00
Natanael Copa
78ae437dd7 Fix gpg usage for alpine images 2016-03-17 11:38:00 +01:00
Natanael Copa
c107bad80c fix docker-php-ext-enable in alpine images 2016-03-17 11:38:00 +01:00
Natanael Copa
5acbdade05 add php:5.6-fpm-alpine 2016-03-17 11:37:59 +01:00
Natanael Copa
29b8ea733f add php:5.6-alpine 2016-03-17 11:37:59 +01:00
Tianon Gravi
b3678663d8 Merge pull request #199 from shin1x1/upgrade-to-7.0.4-5.6.19-5.5.33 
Update to 7.0.4, 5.6.19, and 5.5.33
 2016-03-04 10:12:56 -08:00
shin1x1
cdebaa8f31 Update to 7.0.4, 5.6.19, and 5.5.33 2016-03-04 22:04:34 +09:00
Natanael Copa
0f95b376b3 add php:7.0-fpm-alpine image 2016-03-03 19:09:33 +01:00
Natanael Copa
83c1038d96 fix parallel build for alpine 2016-03-03 19:09:33 +01:00
Natanael Copa
a2e54ec6e6 update alpine image to 7.0.3 2016-03-03 19:09:33 +01:00
Natanael Copa
802686313f fix stripping of alpine image 
busybox `find` does not understand the arg `-exectutable`.
 2016-03-03 19:09:33 +01:00
Natanael Copa
d30d28d547 add php:7.0-alpine 2016-03-03 19:09:33 +01:00
yosifkit
7971ea24db Merge pull request #196 from infosiftr/fix-gpg 
Fix "gpg" usage to stop relying on deprecated and insecure behavior
 2016-02-29 11:27:00 -08:00
Tianon Gravi
8943e1e6a9 Fix "gpg" usage to stop relying on deprecated and insecure behavior 2016-02-29 08:38:54 -08:00
Tianon Gravi
7bd5c38db9 Update to 7.0.3, 5.6.18, and 5.5.32 2016-02-04 15:50:02 -08:00
Tianon Gravi
5919c607c5 Add "zts" to generate-stackbrew-library.sh 2016-01-28 14:18:21 -08:00
Tianon Gravi
5e9ec6fb46 Run update.sh for new zts variant 2016-01-28 14:17:44 -08:00
yosifkit
bdfd0fc1d1 Merge pull request #171 from mikk150/master 
add zts support
 2016-01-27 10:50:57 -08:00
yosifkit
1da4310f6c Merge pull request #184 from infosiftr/fpm-conf 
Refactor FPM support to use upstream's config file directly
 2016-01-22 13:54:00 -08:00
Tianon Gravi
e1292bb6ec Refactor FPM support to use upstream's config file directly 
PHP 7 changed their config to use "include", which is a clever way to support "php-fpm.d" for further configuration.  This adapts our FPM config to follow suit.
 2016-01-22 12:59:21 -08:00
Tianon Gravi
85447ff6a5 Run update.sh 2016-01-19 17:31:29 -08:00
yosifkit
8bcd5be566 Merge pull request #178 from infosiftr/ini-name 
Add "--ini-name" flag to docker-php-ext-enable (especially for controlling order)
 2016-01-19 17:30:48 -08:00
Tianon Gravi
ad14a69d31 Add "--ini-name" flag to docker-php-ext-enable (especially for controlling order) 2016-01-19 16:51:47 -08:00
Joe Ferguson
7122ec89a7 update 5.6.17 2016-01-07 10:21:54 -08:00
Tianon Gravi
cd075c9d4e Update to 5.5.31 and 7.0.2 2016-01-07 09:24:41 -08:00
yosifkit
4e1cb2b3eb Merge pull request #172 from infosiftr/better-zend-check 
Use "nm" to list actual symbols from the module to check for the "zend_extension_entry" symbol (fixes false positives like xcache)
 2016-01-07 09:10:31 -08:00
Tianon Gravi
f181586329 Run update.sh 2016-01-06 16:31:49 -08:00