danog/php
1
0
Fork 0
mirror of https://github.com/danog/php.git synced 2024-11-27 12:24:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
246 Commits 1 Branch 0 Tags 3.7 MiB
Shell 54.8%
Dockerfile 45.2%
d1c1222433
Go to file
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
5.5 Apply update.sh 2016-05-20 16:17:45 +02:00
5.6 Apply update.sh 2016-05-20 16:17:45 +02:00
7.0 Apply update.sh 2016-05-20 16:17:45 +02:00
.travis.yml 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
apache-Dockerfile-block-1 Removed bashism in Dockerfile 2015-04-02 00:01:27 +02:00
apache-Dockerfile-block-2 Add a pid cleaner in case container was killed unexpectedly 2014-12-23 09:52:12 -08:00
docker-php-ext-configure 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
docker-php-ext-enable 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
docker-php-ext-install 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) 2016-05-23 14:28:40 -07:00
Dockerfile-alpine.template 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) 2016-05-23 14:28:40 -07:00
Dockerfile-debian.template 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) 2016-05-23 14:28:40 -07:00
fpm-Dockerfile-block-1 Add FPM variant 2014-11-12 17:37:22 -07:00
fpm-Dockerfile-block-2 Refactor FPM support to use upstream's config file directly 2016-01-22 12:59:21 -08:00
generate-stackbrew-library.sh Add Alpine variants to generate-stackbrew-library.sh 2016-03-18 14:37:47 -07:00
LICENSE Update LICENSE Year 2016-03-21 08:40:23 -04:00
README.md Fix embarassing README.md typo (https://github.com/docker-library/docs/pull/557) 2016-04-26 14:38:11 -07:00
update.sh Add "travisEnv" bits to update.sh 2016-03-18 13:26:18 -07:00
zts-Dockerfile-block-1 add zts support 2016-01-06 20:57:29 +02:00
zts-Dockerfile-block-2 add zts support 2016-01-06 20:57:29 +02:00

README.md

About this Repo

This is the Git repo of the Docker official image for php. See the Docker Hub page for the full readme on how to use this Docker image and for information regarding contributing and issues.

The full readme is generated over in docker-library/docs, specifically in docker-library/docs/php.

See a change merged here that doesn't show up on the Docker Hub yet? Check the "library/php" manifest file in the docker-library/official-images repo, especially PRs with the "library/php" label on that repo. For more information about the official images process, see the docker-library/official-images readme.

Travis CI