danog/php
1
0
Fork 0
mirror of https://github.com/danog/php.git synced 2024-12-15 18:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
673 Commits 1 Branch 0 Tags 3.7 MiB
da77ea9e35
Commit Graph

673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yosifkit
893b4f7371 Merge pull request #282 from infosiftr/override-envvars 
Convert explicit "export A=B" lines of Apache's envvars file into "${A:=B}" such that we can override them at runtime easily
 2016-08-08 12:03:46 -07:00
Tianon Gravi
aea63e358f Apply update.sh 2016-08-08 10:06:26 -07:00
Tianon Gravi
bb2c469018 Convert explicit "export A=B" lines of Apache's envvars file into "${A:=B}" such that we can override them at runtime easily 
Before:

```sh
unset HOME

if [ "${APACHE_CONFDIR##/etc/apache2-}" != "${APACHE_CONFDIR}" ] ; then
	SUFFIX="-${APACHE_CONFDIR##/etc/apache2-}"
else
	SUFFIX=
fi

export APACHE_RUN_USER=www-data
export APACHE_RUN_GROUP=www-data
export APACHE_PID_FILE=/var/run/apache2/apache2$SUFFIX.pid
export APACHE_RUN_DIR=/var/run/apache2$SUFFIX
export APACHE_LOCK_DIR=/var/lock/apache2$SUFFIX
export APACHE_LOG_DIR=/var/log/apache2$SUFFIX

export LANG=C

export LANG
```

After:

```sh
unset HOME

if [ "${APACHE_CONFDIR##/etc/apache2-}" != "${APACHE_CONFDIR}" ] ; then
	SUFFIX="-${APACHE_CONFDIR##/etc/apache2-}"
else
	SUFFIX=
fi

: ${APACHE_RUN_USER:=www-data}
export APACHE_RUN_USER
: ${APACHE_RUN_GROUP:=www-data}
export APACHE_RUN_GROUP
: ${APACHE_PID_FILE:=/var/run/apache2/apache2$SUFFIX.pid}
export APACHE_PID_FILE
: ${APACHE_RUN_DIR:=/var/run/apache2$SUFFIX}
export APACHE_RUN_DIR
: ${APACHE_LOCK_DIR:=/var/lock/apache2$SUFFIX}
export APACHE_LOCK_DIR
: ${APACHE_LOG_DIR:=/var/log/apache2$SUFFIX}
export APACHE_LOG_DIR

: ${LANG:=C}
export LANG

export LANG
```

(minus comments)
 2016-08-01 17:07:10 -07:00
Tianon Gravi
2cc40ce1de Apply update.sh 2016-08-01 09:55:58 -07:00
Tianon Gravi
e36077f85c Update generated Dockerfiles to note the source of their generated contents 2016-08-01 09:55:39 -07:00
Tianon Gravi
59200d11b1 Apply update.sh 2016-07-29 09:36:54 -07:00
Tianon Gravi
a7fed4e2f1 Merge pull request #274 from antoligy/allow-override-params 
Shuffling around order so as to override default configure options.
 2016-07-29 09:36:19 -07:00
Alex Wilson
5842c49fd9
Shuffling around order of optional arguments so as to override default configure options. 2016-07-29 14:52:05 +01:00
Tianon Gravi
cd1769f395 Update to 5.6.24 2016-07-22 12:36:22 -07:00
Tianon Gravi
d8a4ccf4d6 Update to 7.0.9, 5.5.38 2016-07-21 10:49:44 -07:00
Joe Ferguson
f016f5dc42 Run update.sh 2016-07-12 17:15:01 -07:00
yosifkit
1a4763005a Remove extracted php src (#256) 
* Remove php src the right way for lightweight containers.

* Adapt docker-php-ext-* scripts to check exts against /available-exts generated file.

* Improve docker-php-source script

 - swap spaces to tabs to match
 - use gnu tar for `--strip-components`
 - cache known extension list in `/usr/src/`
 - remove extra output

* Changes per tianon's comments
 2016-07-12 17:12:43 -07:00
yosifkit
8f978dd1f2 Merge pull request #255 from infosiftr/allowoverride 
Fix "AllowOverride" and "Indexes" defaults
 2016-07-08 14:43:36 -07:00
Tianon Gravi
11c5d11f1d Fix "AllowOverride" and "Indexes" defaults 2016-07-08 13:46:02 -07:00
yosifkit
23ae7acdbe Merge pull request #251 from infosiftr/envvars 
Source "envvars" in "apache2-foreground" (mimicking apache2ctl), and by so doing, use the default Debian apache2 configuration unmodified
 2016-07-06 17:37:38 -07:00
Tianon Gravi
2dc37fa519 Source "envvars" in "apache2-foreground" (mimicking apache2ctl), and by so doing, use the default Debian apache2 configuration unmodified 2016-07-06 16:07:32 -07:00
Tianon Gravi
e37ca400ba Update to 5.5.37 2016-06-24 09:27:41 -07:00
Tianon Gravi
d0993972f3 Update to 7.0.8, 5.6.23 2016-06-23 11:16:23 -07:00
Tianon Gravi
145f0de1bc Merge pull request #239 from infosiftr/phpize-configure 
Adjust "docker-php-ext-configure" to also install deps, but have "docker-php-ext-install" remove them if and only if it was "docker-php-ext-*" which installed them.
 2016-06-13 17:22:58 -07:00
Tianon Gravi
420351b5e6 Merge pull request #1 from shouze/phpize-configure 
Run update.sh to make the feature available.
 2016-06-13 15:26:23 -07:00
Sébastien HOUZÉ
8344a7fdb4
Run update.sh to make the feature available. 2016-06-12 10:58:09 +02:00
Tianon Gravi
6f3edbc07d Convert "generate-stackbrew-library.sh" to output the new 2822-based format 2016-06-09 11:56:08 -07:00
Tianon Gravi
bad9064ea0 Simplify silly syntax 2016-06-09 10:34:11 -07:00
Tianon Gravi
3099068733 Update to alpine:3.4 2016-06-07 08:54:07 -07:00
Tianon Gravi
1ad06eced2 Adjust "docker-php-ext-configure" to also install deps, but have "docker-php-ext-install" remove them if and only if it was "docker-php-ext-*" which installed them. 2016-06-06 11:01:36 -07:00
Tianon Gravi
81ceba1318 Update to 7.0.7, 5.6.22, 5.5.36 2016-05-26 15:31:29 -07:00
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