Commit Graph

435 Commits

Author SHA1 Message Date
thelittlefireman
157a1c27f1 fix huge mistake : bad copy past and missing parameters 2017-06-23 11:02:47 +02:00
Ric Harvey
b294361b1e set workers automatically closes #122 2017-06-23 09:57:00 +01:00
Richard Harvey
3fea6fc090 Bumped versions of nginx and PHP 2017-06-23 09:44:45 +01:00
Ric Harvey
34e3c96166 Update nginx version to 10.12.0 2017-04-18 09:57:56 +01:00
Ric Harvey
79efb3170b adding else back in 2017-04-18 09:44:00 +01:00
Ric Harvey
dedba49d93 Merge branch 'SKoschnicke-master' 2017-04-18 09:43:15 +01:00
Ric Harvey
502dee57d4 Merge branch 'master' of git://github.com/SKoschnicke/nginx-php-fpm into SKoschnicke-master 2017-04-18 09:41:01 +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
Ric Harvey
c975c8b128 Merge pull request #133 from ciruz/master
Error in PHP docs
2017-03-23 09:48:04 +00:00
ciruz
abcb3b8bc9 error in php docs 2017-03-23 08:29:17 +01: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
847cd43476 Fix sqlite missing modules 2017-03-17 12:32:22 +00:00
Ric Harvey
ab0e1cb90b Merge pull request #127 from TheNavigat/master
Adding PDO Sqlite extension
2017-03-17 10:09:05 +00:00
Amjad Mashaal
5d26aff3e4 Adding PDO Sqlite extension 2017-03-17 01:26:53 +02:00
Ric Harvey
aa551a999e Add new flag REMOVE_FILES to close #121 2017-03-16 16:29:22 +00:00
Ric Harvey
fb035e0955 adding unmaitained tags to docs 2017-03-16 12:01:28 +00:00
Ric Harvey
35c0014862 Added OpCache module closes #123 2017-03-16 10:36:10 +00:00
Ric Harvey
2e17591874 Merge pull request #125 from aschonbe/master
[FIX] Composer.phar Installer auto-version SHA
2017-03-15 09:21:27 +00:00
aschonbe
ce70c0ffc9 [FIX] Composer.phar Installer auto-version SHA
Problem: against best practice, the composer.phar installer download checksum was hard coded, but the latest version of the installer was downloaded, resulting in the checksum often not matching the package; build would ultimately fail.
Solution: grab the latest checksum value along with the latest installer package.

More instructions: https://getcomposer.org/doc/faqs/how-to-install-composer-programmatically.md
2017-03-14 15:07:16 -04:00
Ric Harvey
93492db9dd fix versioning link 2017-02-21 14:08:33 +00:00
Ric Harvey
e7cbabc006 Update to PHP 7.1.2 2017-02-21 12:44:02 +00:00
Ric Harvey
f9298a7462 prep for 1.1.3 updates to scripts 2017-02-20 09:13:10 +00:00
Ric Harvey
5750ff899d Merge pull request #118 from epoxa/patch-1
Typo
2017-02-19 14:40:41 +00:00
epoxa
fb79936726 Update docker_compose.md 2017-02-19 03:36:48 +07:00
Ric Harvey
d86d2e16c8 Fix table syntax in MD 2017-02-17 12:10:43 +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
59e4b25182 Adding docker compose guide 2017-02-17 10:13:14 +00:00
Ric Harvey
df8d254fcd move requiremtns under .travis directory 2017-02-17 09:50:15 +00:00
Ric Harvey
75b8650c4c Merge pull request #115 from Hugome/master
Add jpeg gd support thanks to @Hugome
2017-02-17 09:48:13 +00:00
hugome
ec982706f3 Add jpeg support in gd 2017-02-16 20:01:56 +01:00
Ric Harvey
fc6d46dcec Further README tidy and new kubernetes guide 2017-02-14 17:48:58 +00:00
Ric Harvey
650ccdbe94 Merge pull request #111 from kcampion/patch-1
Update index.php to follow conventions
2017-02-14 10:13:04 +00:00
Ric Harvey
c8362e29d9 tidy up README 2017-02-14 07:23:41 +00:00
Ric Harvey
36d9763e36 added todo and PR info 2017-02-13 23:37:39 +00:00
Ric Harvey
4700e7dcfe Fix links 2017-02-13 23:35:04 +00:00
Ric Harvey
3f7745f8da Adding new links and fixing formatting 2017-02-13 23:33:55 +00:00
Ric Harvey
bee046b2ea Tidy up travis files 2017-02-13 23:22:04 +00:00
Ric Harvey
a0a3069b1c Split documentation for easier updates 2017-02-13 23:19:25 +00:00
Ric Harvey
4cfc4cb998 allowing UID/GID mapping as per issue #73 2017-02-13 10:15:39 +00:00
Kevin Campion
f84984d7c5 Update index.php 2017-02-11 13:11:19 +01:00
Ric Harvey
37f5667fda Update readme formatting 2017-02-10 10:32:02 +00:00
Ric Harvey
cbf763305b Adds support for Real_ip in logs closes #106 2017-02-10 10:05:52 +00:00
Ric Harvey
0b30a3a545 Documentation for #33 installing php modules. 2017-02-10 09:12:23 +00:00
Ric Harvey
72ffbe20f9 Clarify private key closes #110 2017-02-09 17:09:51 +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
723c4f2d1a rm old docker file 2017-02-07 10:45:31 +00:00
Ric Harvey
4ef6c9d89b updated info on readme 2017-02-07 10:42:23 +00:00
Ric Harvey
af3622f638 Merge branch '7.1' 2017-02-07 10:41:03 +00:00