Commit Graph

703 Commits

Author SHA1 Message Date
Tianon Gravi
2c6f508385 Merge pull request #78 from JensErat/conf-enabled
Empty config and sites folders, include them (#76)
2015-04-01 16:22:10 -06:00
Jens Erat
693ce7b4d2 Removed bashism in Dockerfile 2015-04-02 00:01:27 +02:00
Tianon Gravi
0d49708c99 Use && instead of ; for consistency 2015-04-01 13:37:01 -06:00
Jens Erat
f6c40011c8 Empty config and sites folders, include them (#76) 2015-03-25 14:52:46 +01:00
Tianon Gravi
dd4503a7f0 Update to 5.4.39, 5.5.23, and 5.6.7 2015-03-20 09:31:09 -06:00
yosifkit
821fbfda4d Merge pull request #73 from md5/phpize-libc-dev
Add libc-dev as an explicit phpize dependency
2015-03-06 09:24:31 -08:00
Mike Dillon
1e07e91344 Add libc-dev as an explicit phpize dependency 2015-03-05 21:47:52 -08:00
Tianon Gravi
26ede42588 Merge pull request #71 from md5/apt-get-autoremove-everything
Tell apt-get to actually autoremove everything it should
2015-03-02 16:08:06 -07:00
Mike Dillon
93c2ef1326 Make autoremove remove more packages
By default, apt-get autoremove won't remove packages that are recommended or
suggested by *any* installed packages, not just the packages that
auto-installed them.
2015-03-01 17:17:26 -08:00
Tianon Gravi
895c68730d 2015 2015-02-23 13:50:45 -07:00
Tianon Gravi
360fc176e2 Unindent LICENSE 2015-02-23 13:46:30 -07:00
Tianon Gravi
58775aa692 Update to 5.4.38, 5.5.22, 5.6.6 2015-02-19 16:05:40 -07:00
Tianon Gravi
96c15e85e9 Merge pull request #66 from md5/no-indexes
Remove Indexes option from /var/www
2015-02-02 17:20:33 -07:00
Mike Dillon
6383582398 Remove Indexes option from /var/www 2015-01-30 23:05:28 -08:00
Joe Ferguson
d506059bc4 Run update.sh to bump 5.4 2015-01-23 08:59:47 -08:00
Joe Ferguson
c871678cc7 Run update.sh, php 5.5 and 5.6 version bumped 2015-01-22 13:12:12 -08:00
Tianon Gravi
5d49ba5861 Switch from pgp.mit.edu to pool.sks-keyservers.net 2015-01-08 23:41:19 -07:00
yosifkit
d9b5ca4322 Merge pull request #59 from infosiftr/pid-cleaner
Add a pid cleaner in case container was killed unexpectedly
2014-12-23 13:16:28 -08:00
Joe Ferguson
a51c16e5f9 Add a pid cleaner in case container was killed unexpectedly 2014-12-23 09:52:12 -08:00
yosifkit
61918f0fd6 Merge pull request #55 from baptistedonaux/master
[5.4][fpm][php-fpm.conf] Impossible to listen on [::]:9000. Replace by 9...
2014-12-19 11:00:53 -08:00
Tianon Gravi
f972d91aac Update variants too... 2014-12-19 01:24:48 -07:00
Tianon Gravi
be46002aee Bump to 5.6.4 and 5.4.36 2014-12-19 00:38:41 -07:00
Joe Ferguson
4bb8f86780 Run update again to fix apache and fpm versions 2014-12-18 15:35:35 -08:00
Joe Ferguson
938bbe3bad Run update.sh 2014-12-18 14:33:25 -08:00
Baptiste Donaux
2482d46661 [5.4][fpm][php-fpm.conf] Impossible to listen on [::]:9000. Replace by 9000 2014-12-11 15:53:23 +01:00
Tianon Gravi
4a5d6cfe69 Merge pull request #49 from jaredm4/master
Load opcache as a zend_extension.
2014-11-20 16:19:19 -07:00
Jared Markell
58c3fd175c Load opcache as a zend_extension. 2014-11-20 15:08:14 -08:00
yosifkit
5432de9c86 Merge pull request #51 from infosiftr/fix-fpm-listen
Fix php:fpm "listen" directive
2014-11-20 08:41:45 -08:00
Tianon Gravi
9bb0b22480 Fix php:fpm "listen" directive 2014-11-19 16:06:38 -07:00
Joe Ferguson
5bcd974ac0 Add readme stub 2014-11-14 16:17:38 -08:00
Tianon Gravi
583557dc05 MOAAR 2014-11-14 12:34:32 -07:00
yosifkit
09fd8c55bd Merge pull request #37 from infosiftr/fpm
Add FPM variant
2014-11-14 11:43:34 -07:00
Tianon Gravi
18b5d0884c FAILURE (yeah, my bad) 2014-11-14 11:34:45 -07:00
Tianon Gravi
844ed7ce00 Update to 5.5.19 and 5.6.3 for CVEs
Fixes #45; thanks @thaJeztah
2014-11-13 17:34:23 -07:00
Tianon Gravi
80f855114c Add FPM variant 2014-11-12 17:37:22 -07:00
yosifkit
969f7a892e Merge pull request #44 from infosiftr/make
Add back make (which we somehow missed)
2014-11-12 09:59:48 -07:00
Tianon Gravi
b2e1b8e2a3 Add back make (which we somehow missed) 2014-11-12 09:54:38 -07:00
yosifkit
ad9b781547 Merge pull request #41 from infosiftr/keep-the-sauce
Keep the source and instead just "make clean"
2014-11-11 17:24:02 -07:00
Tianon Gravi
0e97c6bb50 Merge pull request #43 from infosiftr/just-php
Make the root more obvious, fix DirectoryIndex to php first
2014-11-11 13:29:33 -07:00
Joe Ferguson
c06a6485d6 Make the root more obvious, fix DirectoryIndex to php first 2014-11-11 12:20:25 -08:00
Tianon Gravi
2c5880107a Add new docker-php-ext-* scripts for magic
For example, the following makes WordPress work:

```Dockerfile
RUN apt-get update && apt-get install -y libpng12-dev && rm -rf /var/lib/apt/lists/* \
	&& docker-php-ext-install gd \
	&& apt-get purge --auto-remove -y libpng12-dev

RUN docker-php-ext-install mysqli
```
2014-11-11 13:17:28 -07:00
Tianon Gravi
4d09bc45cb Keep the source and instead just "make clean" 2014-11-10 16:16:30 -07:00
Tianon Gravi
97c1d907b3 Merge pull request #35 from synctree/enable-soap
Add --enable-soap
2014-11-07 13:41:51 -07:00
Mike Dillon
98f6553f68 Add --enable-soap 2014-11-07 09:58:50 -08:00
Tianon Gravi
1de2401dd6 Merge pull request #38 from infosiftr/ca-certificates
Add ca-certificates (which was in buildpack-deps)
2014-11-06 20:05:50 -07:00
Tianon Gravi
cf2a4bcb5b Add ca-certificates (which was in buildpack-deps) 2014-11-06 20:02:36 -07:00
Tianon Gravi
050469ef2f Merge pull request #36 from infosiftr/slim-build
Refactor Dockerfile, switching the base from `buildpack-deps` over to `debian` directly
2014-11-06 17:40:52 -07:00
Tianon Gravi
a6e6a6381d Refactor Dockerfile, switching the base from buildpack-deps over to debian directly
This results in a dramatic reduction of image size:

```console
$ docker images php
REPOSITORY          TAG                 IMAGE ID            CREATED              VIRTUAL SIZE
php                 5.4                 6b03f428509e        3 hours ago          354.3 MB
php                 5.4-apache          2bd126f2c469        2 minutes ago        394.8 MB
php                 5.5                 19a5113df69a        9 minutes ago        356.4 MB
php                 5.5-apache          6c892721307f        2 minutes ago        396.9 MB
php                 5.6                 69aead156fe7        10 minutes ago       356.8 MB
php                 5.6-apache          2d0bae628aaf        About an hour ago    397.3 MB
```

vs the old:

```console
$ docker images php
REPOSITORY          TAG                 IMAGE ID            CREATED             VIRTUAL SIZE
php                 5.4                 e760b9bd2c6c        2 days ago          736.9 MB
php                 5.4-apache          62c23e8f1704        2 days ago          811.8 MB
php                 5.5                 156d2a323bc0        2 days ago          739.8 MB
php                 5.5-apache          3014d0f81b29        2 days ago          814.7 MB
php                 5.6                 dab86418397c        2 days ago          740.2 MB
php                 5.6-apache          b3c4a0633954        2 days ago          815.1 MB
```
2014-11-06 17:34:27 -07:00
Tianon Gravi
c1fe2a2c01 Merge pull request #32 from infosiftr/remove-buildconf
Remove buildconf from our Dockerfiles since we use the release tarballs...
2014-11-03 17:18:05 -07:00
Tianon Gravi
a3dcd78179 Remove buildconf from our Dockerfiles since we use the release tarballs, which have pre-generated configure scripts 2014-11-03 17:02:20 -07:00