Commit Graph

306 Commits

Author SHA1 Message Date
Tianon Gravi
7e9ddae4fd Rename "7.1" to "7.1-rc" to simplify "update.sh" refactoring (and make it explicit when we're looking at pre-releases) 2016-10-17 09:09:36 -07:00
Docker Library Bot
337928c13c Update to 5.6.27 2016-10-14 16:43:04 -07:00
Tianon Gravi
0c5a8fead1 Adjust "update.sh" whitespace and remove unused section (old copy-pasta) 2016-10-14 15:11:54 -07:00
Docker Library Bot
9f01025115 Update to 7.0.12 2016-10-13 17:46:12 -07:00
yosifkit
10520c47e2 Merge pull request #306 from hiddeco/php-71-rc3
Updated PHP7.1 to RC3
2016-09-30 10:56:02 -07:00
Hidde Beydals
cbca335c53 Updated PHP7.1 to RC3 2016-09-30 09:41:51 +02:00
Tianon Gravi
f4d7811574 Update README with Jenkins badge change (see https://github.com/docker-library/docs/pull/697) 2016-09-21 13:21:55 -07:00
Tianon Gravi
3493e29c9b Update the other two 7.1 variants for 7.1.0RC2 2016-09-16 09:02:46 -07:00
Tianon Gravi
3769e0519c Merge pull request #298 from renatomefidf/update/7.1.0RC2
Updated PHP 7.1 to RC2
2016-09-16 09:02:04 -07:00
Docker Library Bot
1c56325a69 Update to 5.6.26 2016-09-16 05:46:13 -07:00
Renato Mendes Figueiredo
d04f889568 Updated PHP 7.1 to RC2 2016-09-16 14:32:01 +02:00
Docker Library Bot
6924505927 Update to 7.0.11 2016-09-15 05:46:19 -07:00
yosifkit
72e3d7acdc Merge pull request #296 from infosiftr/7.1
Add PHP 7.1.0RC1
2016-09-06 16:08:53 -07:00
Tianon Gravi
ce3d81c7ee Add PHP 7.1.0RC1 2016-09-06 12:31:18 -07:00
Tianon Gravi
e99aaef472 Add some useful comments to update.sh for gpgKeys "provenance" 2016-09-06 12:24:23 -07:00
Tianon Gravi
9c425b7fb5 Remove 5.5 gpgKeys from update.sh 2016-09-06 12:17:36 -07:00
yosifkit
6e93483f56 Merge pull request #293 from infosiftr/https
Use "https" for communications with "php.net" where possible
2016-08-22 16:27:13 -07:00
Tianon Gravi
2f96a00aaa Use "https" for communications with "php.net" where possible 2016-08-22 15:47:04 -07:00
Tianon Gravi
7e86d3dd84 Update to 5.6.25 2016-08-22 09:58:56 -07:00
Tianon Gravi
8c97d460ce Update to 7.0.10 2016-08-18 16:35:54 -07:00
Tianon Gravi
6b2316cc5a Merge pull request #291 from infosiftr/curse-your-sudden-but-inevitable-betrayal
Fix sed to modify the envvars file
2016-08-17 10:06:37 -07:00
Joe Ferguson
800aea518e Fix sed to modify the envvars file 2016-08-16 15:54:50 -07:00
Tianon Gravi
86a4f8d1cf Simplify silly syntax 2016-08-11 16:18:33 -07:00
Tianon Gravi
3c014371a8 Merge pull request #289 from infosiftr/eol-5.5
Remove 5.5 (EOL as of 21 Jul 2016)
2016-08-11 15:34:29 -07:00
Tianon Gravi
d9fb494f70 Remove 5.5 (EOL as of 21 Jul 2016)
See also https://secure.php.net/eol.php
2016-08-11 15:32:54 -07:00
yosifkit
882b9c25f1 Merge pull request #288 from infosiftr/backwards-compat
Return backwards compatibility to the way we handle /usr/src/php/ext/* (especially for user-supplied subdirectories looking to utilize docker-php-ext-* for non-core modules)
2016-08-10 09:32:01 -07:00
Tianon Gravi
d6b446a77a Apply update.sh 2016-08-09 14:32:13 -07:00
Tianon Gravi
593d50701a Return backwards compatibility to the way we handle /usr/src/php/ext/* (especially for user-supplied subdirectories looking to utilize docker-php-ext-* for non-core modules) 2016-08-09 14:28:11 -07:00
Tianon Gravi
195f9c7267 Apply update.sh 2016-08-09 09:26:58 -07:00
Tianon Gravi
01ab2f7ff3 Minor whitespace and alphabetizing tweaks 2016-08-09 09:26:03 -07:00
Tianon Gravi
3a17ab01a3 Merge pull request #287 from fixd/master
enable ftp by default
2016-08-09 09:21:55 -07:00
Patrick O'Meara
1d332d0e8f enable-ftp
--enable-ftp as some php function need it compiled statically

fixes docker-library/php#236
2016-08-09 17:45:09 +10:00
Patrick O'Meara
6101c944ab Merge pull request #1 from docker-library/master
update from base
2016-08-09 17:39:05 +10:00
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