Commit Graph

46 Commits

Author SHA1 Message Date
Ric Harvey
cfed8f474f Merge branch 'xdebug' of git://github.com/that0n3guy/nginx-php-fpm 2017-08-18 14:19:54 +01:00
Ric Harvey
ff9649540c Merge branch 'patch-1' of git://github.com/thelittlefireman/nginx-php-fpm into thelittlefireman-patch-1 2017-08-18 14:15:48 +01:00
Peter O
bb97c9937d added comment on where error comes from 2017-06-23 13:49:01 -05:00
Peter O
381434a6db initial xdebug additions 2017-06-23 11:32:26 -05:00
thelittlefireman
157a1c27f1 fix huge mistake : bad copy past and missing parameters 2017-06-23 11:02:47 +02:00
Ric Harvey
79efb3170b adding else back in 2017-04-18 09:44:00 +01:00
thelittlefireman
3bc935e817 fix bad copy past
fix bad copy past
2017-04-07 09:44:49 +02:00
thelittlefireman
49ddd9fe3e Prevent config files from being filled to infinity
When you start/stop Successively your container, the file /root/.ssh/conf and /usr/local/etc/php-fpm.conf grow to infinity : loop repetition of line "; Include one or more files. If glob(3) exists, it is used to include a bunch of
; files from a glob(3) pattern. This directive can be used everywhere in the
; file.
; Relative path can also be used. They will be prefixed by:
;  - the global prefix if it's been set (-p argument)
;  - /usr/local otherwise
include=etc/php-fpm.d/*.conf
php_flag[display_errors] = off
php_flag[display_errors] = off
php_flag[display_errors] = off
php_flag[display_errors] = off
php_flag[display_errors] = off"
2017-04-07 09:43:19 +02:00
Sven Koschnicke
7f2ff02904 Fix running composer with respect to different WEBROOT.
The composer configuration should always be located in the project root,
independently where the webroot is located. Closes #95.
2017-03-20 13:05:41 +01:00
Ric Harvey
aa551a999e Add new flag REMOVE_FILES to close #121 2017-03-16 16:29:22 +00:00
Ric Harvey
cdfba3cfd0 update to nginx 1.11.10/versioning/composer fix closes #95 2017-02-17 11:24:54 +00:00
Ric Harvey
4cfc4cb998 allowing UID/GID mapping as per issue #73 2017-02-13 10:15:39 +00:00
Ric Harvey
cbf763305b Adds support for Real_ip in logs closes #106 2017-02-10 10:05:52 +00:00
Ric Harvey
869483e5a2 fixed if statement in start script 2017-02-07 11:37:11 +00:00
Ric Harvey
e6da096f0e fix start script 2017-02-07 11:15:23 +00:00
Ric Harvey
af3622f638 Merge branch '7.1' 2017-02-07 10:41:03 +00:00
Ric Harvey
2ec8a51070 merge in @royrico pull request into 7.1 code 2017-02-07 10:36:43 +00:00
Ric Harvey
784e07feb0 fix script to change php vars 2017-02-07 09:55:21 +00:00
Roy Rico
3d70ac9b3f updated script to work with bitbucket and use ssh vs https
updated scripts to support specifying a git branch

updated docs to reflect new environment variables

removed debugging comments
2017-02-06 21:14:54 -07:00
Ric Harvey
c445176457 First 7.1 build with nginx complie 2017-02-05 22:46:45 +00:00
Ric Harvey
d7f66d83af testing for #95 composer auto run 2017-01-06 14:55:12 +00:00
Ric Harvey
00b51479e9 closes #103 2017-01-06 09:22:18 +00:00
Ric Harvey
919add13e0 Merge pull request #100 from fvigotti/patch-1
added exec to supervisord
2017-01-03 09:34:41 +00:00
Ric Harvey
bc75013ac4 Switching master to PHP7 2017-01-03 09:19:57 +00:00
fvigotti
b18a612168 added exec to supervisord
without it the signal is not passed to supervisord process by bash :)
2016-12-15 16:56:29 +00:00
Ric Harvey
6ecfdbdf2e adding nginx config support 2016-08-16 11:29:35 +01:00
Ric Harvey
faf0f8e7c3 adding scripting support 2016-08-09 14:00:01 +01:00
Dan Robertson
aaf1b21ec8 "added token support" 2016-08-09 13:58:32 +01:00
Dan Robertson
f4ea5fac41 added token support 2016-08-09 13:36:00 +01:00
Ric Harvey
9a9f098d2c fix webroot 2016-07-26 10:54:54 +01:00
Ric Harvey
79f3a36a9d revert webroot in start.sh so it support webroot as a sub directory of your repo 2016-07-26 10:42:55 +01:00
Ric Harvey
9bd2dd0732 tweaks 2016-07-22 15:39:57 +01:00
Jack McNicol
a90c60009c set clear_env => no
enables $_ENV[] can be used without hack sed replace
2016-07-22 02:43:37 +09:30
Jack McNicol
e741466e76 replace fpm conf with env var 2016-07-22 02:41:58 +09:30
Jack McNicol
52ef7b848c always chown webroot for better mounting 2016-07-22 02:13:17 +09:30
Jack McNicol
7e58270683 set webroot default folder 2016-07-22 02:12:13 +09:30
Ric Harvey
8312ca3e2d Adding new features to control PHP and hide nginx version 2016-07-13 16:49:32 +01:00
Ric Harvey
8f8cfc1ac7 Allow user to customise webroot 2016-06-30 15:08:52 +01:00
Ric Harvey
8d2f1091d1 Adding a check to stop pull of code if its already there 2016-06-30 11:30:40 +01:00
Ric Harvey
64a8904aa6 Fix ownership of webRoot to allow uploads 2016-06-23 14:09:34 +01:00
Christoph
fd638030e0 Fix typo :) 2016-06-21 02:04:20 +02:00
Ric Harvey
7ae3dd5094 Fix missing echo closes issue #44 2016-06-16 13:56:37 +01:00
Ric Harvey
f0660ec428 Closes issue #40 rm /usr/share/nginx/html/* 2016-06-16 09:56:03 +01:00
Ric Harvey
9e216a395f Updated to alpine linux 2016-06-15 15:36:42 +01:00
Ric Harvey
3ec76e00ba Updated to support custom module install and switch template off by default 2016-02-27 19:15:59 +00:00
Ric Harvey
5a4ecbcf35 Tidy up directory structure 2016-01-18 22:08:03 +00:00