Commit Graph

260 Commits

Author SHA1 Message Date
Ric Harvey
3cc4575ac2 Merge branch 'master' into stable 2015-06-24 20:04:35 +01:00
Ric Harvey
dc045722f5 Adding postgreSQL and mongoDB drivers 2015-06-24 20:03:09 +01:00
Richard Harvey
f679cc8d98 Merge pull request #10 from levidurfee/master
Changed deplyname to deployname
2015-06-24 19:56:19 +01:00
Levi
631f0690b4 Changed deplyname to deployname 2015-06-21 13:24:00 -04:00
Ric Harvey
479ccc084f Merge branch 'master' into stable 2015-06-01 12:37:14 +01:00
Ric Harvey
97bdfe5925 Updating mainline to version 1.9.1 2015-06-01 12:36:07 +01:00
Ric Harvey
a370bd6b48 Updating readme 2015-05-22 10:53:33 +01:00
Ric Harvey
774c511185 maiking mainline the master branch 2015-05-22 10:51:48 +01:00
Richard Harvey
40146525c3 Merge pull request #8 from ekohl/patch-1
Use correct quotes to show as code
2015-05-22 10:49:10 +01:00
Ewoud Kohl van Wijngaarden
6a0de13bbc Use correct quotes to show as code 2015-05-22 11:44:44 +02:00
Richard Harvey
2794326a09 Merge pull request #7 from ngineered/stable
Adding template skipping
2015-05-22 10:44:20 +01:00
Richard Harvey
48d5d96683 Adding template skipping 2015-05-22 10:42:19 +01:00
Richard Harvey
6755565d82 adding info for skipping templating to README 2015-05-22 10:41:25 +01:00
Richard Harvey
229570d5a8 Merge pull request #6 from ekohl/update-start.sh
Allow skipping the templating
2015-05-22 10:33:15 +01:00
Ewoud Kohl van Wijngaarden
3cef700b9d Allow skipping the templating
When you have a large code base, the templating can take some time. This
allows you to skip it if you have no interest in it.

Maybe a more sane default would be to disable it unless explicitly
activated, but that would be backwards incompatible.
2015-05-22 10:11:42 +02:00
Ewoud Kohl van Wijngaarden
97df0a6d14 Ensure /root/.ssh exists 2015-05-22 10:09:39 +02:00
Richard Harvey
0997c310a7 Merge pull request #5 from ngineered/stable
Updated mainline to 1.9.0
2015-05-20 17:13:19 +01:00
Richard Harvey
a27ac90c4f Merge pull request #4 from ngineered/mainline
Updated to nginx 1.9.0 in mainline
2015-05-20 17:12:56 +01:00
Ric Harvey
e1fc38e9f4 Updated mainline to 1.9.0 2015-05-20 17:12:18 +01:00
Ric Harvey
e32c751b13 Updated to nginx 1.9.0 in mainline 2015-05-20 17:11:27 +01:00
Ric Harvey
57a2e0b5a7 Moving mainline to 1.9.0 2015-05-20 17:09:12 +01:00
Richard Harvey
0f4663653b Merge pull request #3 from ngineered/mainline
Updating to latest nginx versions
2015-04-22 16:22:52 +01:00
Ric Harvey
5244b61d01 Updating to latest nginx versions 2015-04-22 16:19:05 +01:00
Ric Harvey
195aace9f5 Updating Nginx Versions 2015-04-22 16:17:28 +01:00
Richard Harvey
675693872e Merge pull request #2 from ngineered/mainline
Updated Readme to reflect mainline version
2015-02-22 17:04:05 +00:00
Richard Harvey
a2421f6dde Merge pull request #1 from ngineered/stable
Stable
2015-02-22 17:03:50 +00:00
Ric Harvey
a749896413 Updated Readme to reflect mainline version 2015-02-22 17:00:35 +00:00
Ric Harvey
8ef2a68353 Updated Readme to reflect mainline version 2015-02-22 16:59:56 +00:00
Ric Harvey
8503ec58ec Updated versions in README to match new mainline version 2015-02-22 16:58:13 +00:00
Ric Harvey
52ef05939a Merge branch 'master' into stable 2015-02-13 12:42:02 +00:00
Ric Harvey
2ff4e0a1ac Fix type in README 2015-02-13 12:41:38 +00:00
Ric Harvey
2225a7ed86 Merge branch 'master' into stable 2015-01-30 21:16:47 +00:00
Ric Harvey
4987fab3e9 Fix permissions so PHP can write to dir 2015-01-30 21:15:55 +00:00
Ric Harvey
dececaf14e Merge branch 'master' into stable 2015-01-30 12:09:13 +00:00
Ric Harvey
54c19709c3 Fixing strict host checking issue 2015-01-30 11:34:58 +00:00
Ric Harvey
46596d32fe Merge branch 'master' into stable 2015-01-28 15:20:30 +00:00
Ric Harvey
dcf6cd77bf Adding extra info to README and syntax fix 2015-01-28 15:19:39 +00:00
Ric Harvey
95df47ce17 Merge branch 'master' into stable 2015-01-28 14:59:25 +00:00
Ric Harvey
f9531f393d Added SSL info to the readme file 2015-01-28 14:58:33 +00:00
Ric Harvey
4f6561f35d Adding new conf directory 2015-01-28 14:09:25 +00:00
Ric Harvey
d9e3c7e8b0 Merge branch 'master' into stable 2015-01-28 11:52:02 +00:00
Ric Harvey
dfcc9ff123 Making README.md Docker Hub friendly. 2015-01-28 11:47:13 +00:00
Ric Harvey
bb5fb4d51d Merge branch 'master' into stable 2015-01-28 11:37:09 +00:00
Ric Harvey
4bab9195d4 Tweaked nginx and php for performance 2015-01-28 11:33:00 +00:00
Ric Harvey
46b16bede8 Creating stable branch release, Nginx 1.6.2 2015-01-27 18:25:02 +00:00
Ric Harvey
17737ab026 README updates 2015-01-27 18:22:49 +00:00
Ric Harvey
8c69f228d5 README updates 2015-01-27 18:21:14 +00:00
Ric Harvey
da9d20123e README updates 2015-01-27 18:17:09 +00:00
Ric Harvey
332c0c2a11 Readme updates 2015-01-27 18:15:17 +00:00
Ric Harvey
08e2b57305 formatting readme 2015-01-27 18:06:53 +00:00