Ric Harvey
a788d25a96
updated nginx to 1.9.9
2016-01-16 21:18:46 +00:00
Richard Harvey
3d0e68f483
Merge pull request #30 from marsanla/master
...
Update mcrypt config
2016-01-16 21:10:45 +00:00
Richard Harvey
0cac107181
Merge pull request #26 from daveosborne/master
...
Supervisord pass through stdout and stderr from children
2016-01-16 21:09:13 +00:00
Ric Harvey
094aac35b6
Merge branch 'master' of github.com:ngineered/nginx-php-fpm
2016-01-16 21:07:59 +00:00
Ric Harvey
d3fffbc3ad
image updates
2016-01-16 21:07:43 +00:00
Richard Harvey
1fe64cf437
Merge pull request #27 from smith64fx/patch-1
...
Better verify of permissions
2016-01-16 21:07:24 +00:00
Marcos Sanz
725881baa2
Update Dockerfile
2016-01-12 03:15:55 +01:00
Smithi
1716adc65e
Better verify of permissions
...
I had a problem with your docker, when I mounted my web files from a docker volume container. The rights were still set to the owner root:root.
With this little fix they should be set properly to the runtime!
Cheers,
Michael
2015-12-29 20:07:41 +07:00
Dave Osborne
e45b1a4585
redirect supervisord child process stdout through to the container's stdout
2015-12-20 23:44:53 -05:00
Richard Harvey
8b94073052
Merge pull request #25 from antonienko/patch-1
...
Small typo
2015-12-17 10:52:09 +00:00
Antonio Manuel Hernández Sánchez
dd4c62e004
Small typo
2015-12-16 12:21:44 +01:00
Ric Harvey
eb69b8d45f
Updating to 1.9.5 with HTTP2 support
2015-10-03 13:52:08 +01:00
Richard Harvey
d39123d2bc
Bumping nginx version
...
changed to 1.9.4
2015-09-03 09:39:40 +01:00
Richard Harvey
f6d84e6803
Merge pull request #17 from LukePeterson/patch-1
...
Remove double php5-mysql inclusion
2015-09-03 09:38:37 +01:00
Luke Peterson
a9111de172
Remove double php5-mysql inclusion
2015-07-23 16:59:45 +10:00
Richard Harvey
9109039cef
Merge pull request #16 from ngineered/stable
...
Stable
2015-07-17 14:58:01 +01:00
Richard Harvey
6b03a0dd73
Merge pull request #15 from ngineered/mainline
...
Mainline
2015-07-17 14:57:40 +01:00
Ric Harvey
de389ffcba
Merge branch 'master' into stable
2015-07-17 13:55:30 +00:00
Ric Harvey
a98ba847f0
Merge branch 'master' into mainline
2015-07-17 13:55:12 +00:00
Ric Harvey
9ae8061a07
Fix issue #14
2015-07-17 13:54:57 +00:00
Ric Harvey
64cc346449
Merge branch 'master' into stable
2015-07-15 11:17:11 +00:00
Ric Harvey
a4318f72eb
Merge branch 'master' into mainline
2015-07-15 11:16:51 +00:00
Ric Harvey
941cdffc8f
remove duplicate default nginx config
2015-07-15 11:02:24 +00:00
Ric Harvey
1b13ce62c2
changes in user for nginx and php-fpm
2015-07-15 10:47:08 +00:00
Ric Harvey
ffc9ee6f33
No stdout on supervisor for the moment
2015-07-15 10:18:49 +00:00
Ric Harvey
c9e5181ab8
fix supervisord
2015-07-15 10:05:36 +00:00
Ric Harvey
b1ca04a38b
fix supervisord
2015-07-15 10:04:44 +00:00
Ric Harvey
d4509afd5f
updated supervisord location in start.sh script
2015-07-15 10:02:14 +00:00
Ric Harvey
ab4dc68fc2
Using stable branch of nginx
2015-07-15 09:02:42 +00:00
Ric Harvey
195e6999c2
Adding autoremove
2015-07-15 08:49:52 +00:00
Ric Harvey
10cdaa81cb
Updating Dockerfile for smaller image and nginx PPA
2015-07-15 08:24:32 +00:00
Ric Harvey
eb99e527c9
removing imagemagic
2015-07-14 11:34:27 +00:00
Ric Harvey
10c06a0933
Removing the need for wget
2015-07-14 10:59:31 +00:00
Ric Harvey
c4d382151d
Tidy up dockerfile
2015-07-14 10:37:55 +00:00
Ric Harvey
8bc2d86334
image shrink
2015-07-13 12:13:18 +00:00
Ric Harvey
29366ef97a
reducing debian image size (hopefully)
2015-07-13 11:18:49 +01:00
Ric Harvey
a94ed8b750
fixing a typo whilst using vim!
2015-07-10 15:06:17 +00:00
Ric Harvey
07ee70e194
Fixed install on debian
2015-07-10 14:46:49 +00:00
Ric Harvey
ee8dcb4357
Tweaking for debian
2015-07-10 15:04:42 +01:00
Ric Harvey
a026b88901
Building debian branch
2015-07-10 14:49:20 +01:00
Ric Harvey
2803363c8d
Working on logging
2015-07-10 11:17:07 +01:00
Ric Harvey
179849b556
Fixing priorities in supervisord to reduce start up errors
2015-07-09 23:24:36 +01:00
Ric Harvey
016df2237e
Tightening up supervisord config
2015-07-09 23:16:45 +01:00
Ric Harvey
7ffff83d79
Tweak to volume creation
2015-07-09 23:09:45 +01:00
Ric Harvey
b5c0d64ca2
tweaks to docker file to add volume support
2015-07-09 22:18:29 +01:00
Richard Harvey
14bee7b1bc
Merge pull request #13 from artburkart/touchup-readme
...
Small fix in README
2015-07-05 20:54:50 +01:00
Arthur Burkart
fdf884fd15
Small fix in README
2015-07-04 11:26:53 -04:00
Ric Harvey
1c1c77889f
Swapping beta to mainline
2015-06-25 13:30:45 +00:00
Richard Harvey
80c0eea98f
Merge pull request #12 from ngineered/stable
...
Stable
2015-06-25 14:29:11 +01:00
Ric Harvey
0e829ddfae
Merge branch 'master' into stable
2015-06-25 13:17:19 +00:00
