Commit Graph

632 Commits

Author SHA1 Message Date
Peter Kokot
894ee591c5 Remove the Alpine argon2 library fix
The fix has been patched upstream in Alpine and upcoming
PHP 7.4.0alpha2.
2019-06-25 15:04:07 -07:00
Tianon Gravi
2e2df0625b
Merge pull request #843 from J0WI/curl
Use already available curl and consistent code style
2019-06-25 15:00:00 -07:00
Tianon Gravi
250c2d872d Add "set -u" and more consistency 2019-06-24 14:55:17 -07:00
J0WI
82d590a8c7 Use already available curl and consistent code style 2019-06-24 12:55:09 -07:00
Tianon Gravi
c0f68b2602
Merge pull request #845 from J0WI/alpine10
Add Alpine 3.10
2019-06-24 12:53:47 -07:00
J0WI
27cfb7191f Update default to Alpine 3.10 2019-06-21 23:22:16 +02:00
J0WI
3802051cc9 Add Alpine 3.10 2019-06-20 15:20:27 +02:00
Tianon Gravi
9687d42a62
Merge pull request #842 from infosiftr/drop-jessie
Drop alpine 3.8 and jessie builds;
2019-06-14 16:53:48 -07:00
Joe Ferguson
3a3efd8f02 Drop alpine 3.8 and jessie builds; these were only kept around for users to transition to stretch or 3.9 (see https://github.com/docker-library/php/issues/504) 2019-06-14 16:41:39 -07:00
yosifkit
191ca54f86
Merge pull request #840 from infosiftr/7.4-rc
Add 7.4.0alpha1
2019-06-14 16:10:33 -07:00
Joe Ferguson
a9f19e9df5 Apply minor changes to non 7.4 versions to make deleting lines easier for 7.4 2019-06-14 14:04:15 -07:00
Joe Ferguson
d92a953b08 Fix build issues on 7.4.0-alpha1 2019-06-14 14:02:52 -07:00
Tianon Gravi
3822c170a2 Update generated README
Especially to link to the new FAQ entry (https://github.com/docker-library/faq#an-images-source-changed-in-git-now-what)
2019-06-13 16:21:45 -07:00
Tianon Gravi
3e9d32bb97 Add 7.4.0alpha1 2019-06-13 16:21:11 -07:00
yosifkit
10c1eeee03
Merge pull request #837 from magikid/master
Sets PHP error level for getting extension dir
2019-06-07 15:28:52 -07:00
Tianon Gravi
a7e2de0e8f Send PHP errors/warnings to stderr in our scripts 2019-06-07 14:00:03 -07:00
Chris Jones
54c2790f09
Sets PHP error level for getting extension dir
If an uncaught exception is thrown during parsing of the php.ini file, `$extDir` will contain a combination of the exception and the path.  This script shouldn't care about error messages though as long as it gets the path.  This updates the script so that php won't emit any error messages.
2019-06-06 14:10:55 -04:00
Docker Library Bot
fa29b56ad4 Update to 7.2.19 2019-05-30 18:46:11 +00:00
Docker Library Bot
68f7e2d97a Update to 7.1.30 2019-05-30 18:46:11 +00:00
Docker Library Bot
8203d502a1 Update to 7.3.6 2019-05-30 12:46:12 +00:00
Docker Library Bot
e63194a000 Update to 7.1.29 2019-05-03 06:46:11 +00:00
Docker Library Bot
d9352e08aa Update to 7.2.18 2019-05-02 12:46:10 +00:00
Docker Library Bot
85b2af6354 Update to 7.3.5 2019-05-02 12:46:10 +00:00
Tianon Gravi
545a73c970 Update comment format to match our other inline comments 2019-04-23 14:31:59 -07:00
Tianon Gravi
b248f8fe4c
Merge pull request #816 from lcobucci/define-stopsignal-for-fpm
Perform graceful stops on PHP-FPM
2019-04-23 14:30:24 -07:00
Luís Cobucci
e21810a050
Perform graceful stops on PHP-FPM
The default signal used by docker to stop a container is SIGTERM and
that signal is understood by PHP-FPM as immediate termination.

This means that `php-fpm` won't wait for in-flight requests to finish
before of stopping the workers and main process. This behaviour is quite
undesired for production environments and should be avoided as much as
possible.

This implementation is meant to be extremely simple and only address the
stop signal used when running `docker stop`. `php-fpm` signal choices
are somewhat peculiar (`SIGUSR2` for example) and if we want to "fix"
them we would have to use a tool (e.g.: `dumb-init`).

More info:

 - https://linux.die.net/man/8/php-fpm
 - https://docs.docker.com/engine/reference/builder/#stopsignal
 - https://github.com/Yelp/dumb-init
 - https://github.com/usabilla/php-docker-template/pull/102
2019-04-18 17:20:45 +02:00
Docker Library Bot
cf02ea0f79 Update to 7.2.17 2019-04-04 22:16:22 +00:00
Docker Library Bot
4ac9fae8a9 Update to 7.1.28 2019-04-04 22:16:22 +00:00
Docker Library Bot
a5c895da27 Update to 7.3.4 2019-04-04 22:16:22 +00:00
yosifkit
583104eb59
Merge pull request #809 from infosiftr/secure.php.net
Swap "secure.php.net" for "www.php.net" (now that it supports https properly)
2019-04-04 15:15:30 -07:00
Tianon Gravi
9a1758ad35 Swap "secure.php.net" for "www.php.net" (now that it supports https properly) 2019-04-04 13:37:25 -07:00
Docker Library Bot
de645c824f Update to 7.3.4 2019-04-04 12:51:00 +00:00
Docker Library Bot
a5cc6ff7d8 Update to 7.1.27 2019-03-07 13:47:49 +00:00
Docker Library Bot
873725e57e Update to 7.2.16 2019-03-07 13:47:49 +00:00
Docker Library Bot
bb16de8a71 Update to 7.3.3 2019-03-07 13:47:49 +00:00
yosifkit
66395400ad
Merge pull request #799 from infosiftr/apk-virtual
Remove "--virtual" where it's not providing value (and use "apk del --no-network" consistently)
2019-03-05 17:42:09 -08:00
Tianon Gravi
a1ebdc9851 Remove "--virtual" where it's not providing value (and use "apk del --no-network" consistently) 2019-03-04 16:41:05 -08:00
yosifkit
2005b523c6
Merge pull request #796 from glensc/patch-2
remove extensions/*.a
2019-02-15 16:41:09 -08:00
Joe Ferguson
640a30e8ff Apply 'remove extensions/*.a' to templates and run update.sh 2019-02-14 16:30:31 -08:00
Elan Ruusamäe
135678e1ef
remove extensions/*.a
the .a are build artifact from libtool; these are not used in any way.
2019-02-12 15:19:24 +02:00
Docker Library Bot
52c62d3afb Update to 7.2.15 2019-02-07 13:51:14 +00:00
Docker Library Bot
3c64c61733 Update to 7.3.2 2019-02-07 13:51:14 +00:00
Tianon Gravi
5f2b9c2d60 Adjust base image exclusion in generate-stackbrew-library.sh 2019-02-04 15:28:35 -08:00
Tianon Gravi
22f1373e68
Merge pull request #786 from J0WI/alpine-3.9
Add Alpine 3.9 variant
2019-02-01 16:52:16 -08:00
J0WI
90beb19f38 Add Alpine 3.9 variant 2019-02-01 13:37:56 -08:00
Tianon Gravi
e9320fdb75 Revert "Update to 5.6.40" (this removes the EOL 5.6 series)
This reverts commit 783878384a.
2019-02-01 13:36:53 -08:00
yosifkit
fab49d4cb1
Merge pull request #787 from infosiftr/arbitrary-user-AGAIN
Adjust "/var/www/html" permissions consistently across variants
2019-01-31 16:47:29 -08:00
Tianon Gravi
ea377551f7 Adjust "/var/www/html" permissions consistently across variants
The issue speaks for itself:

```console
$ docker run --rm php:apache ls -ld /var/www/html
drwxrwxrwx 2 www-data www-data 4096 Jan 22 21:56 /var/www/html

$ docker run --rm php:fpm ls -ld /var/www/html
drwxr-xr-x 2 root root 4096 Jan 22 22:10 /var/www/html
```
2019-01-31 14:45:15 -08:00
yosifkit
ecd7dcc69c
Merge pull request #775 from infosiftr/5.6.40
Update to 5.6.40
2019-01-11 16:54:47 -08:00
Tianon Gravi
783878384a Update to 5.6.40 2019-01-11 15:31:57 -08:00