1
0
mirror of https://github.com/dokku/buildpack-nginx.git synced 2024-11-09 05:00:50 +00:00
Commit Graph

80 Commits

Author SHA1 Message Date
Jose Diaz-Gonzalez
06888793b1 Merge pull request #8 from alexleclair/master
Copy app.json from www/ into $BUILD_DIR for deployment task support
2016-09-19 23:11:40 -06:00
Jose Diaz-Gonzalez
7e7e9be442 Merge pull request #7 from FireCoding/master
add .gitignore
2016-09-19 23:10:56 -06:00
Jose Diaz-Gonzalez
fd73b73748 Merge pull request #6 from iliyat/master
Merge forks
2016-09-19 23:08:55 -06:00
Jose Diaz-Gonzalez
e1efa9a3a2 Merge pull request #5 from florianheinemann/master
Merge upstream florianheinemann/buildpack-nginx
2016-09-19 23:04:18 -06:00
Alexandre Leclair
ca7b083aad Now copying app.json from www/ into $BUILD_DIR, thus allowing pre/post deploy scripts to execute 2016-08-24 14:20:29 -04:00
David
b7d61bbea4 add .gitignore 2016-07-27 20:48:14 -04:00
Jose Diaz-Gonzalez
d4f83febf9 Update README.md 2016-06-30 14:27:22 -04:00
Jose Diaz-Gonzalez
513791b391 Fix link in readme 2016-05-10 17:20:47 -04:00
Iliya Tovstyonok
2e9a75e96b Merge pull request #3 from florianheinemann/master
update fork
2016-05-08 00:59:46 +03:00
Florian Heinemann
afa0a94343 Merge pull request #13 from milanholy83/master
nginx 1.8.1
2016-02-09 11:43:03 +01:00
milanholy83
ce6895ef38 nginx 1.8.1 2016-02-09 11:28:01 +01:00
Iliya Tovstyonok
6b7fd744ce Merge pull request #2 from florianheinemann/master
Last commits
2016-01-13 10:58:17 +03:00
Florian Heinemann
9d273c7607 Merge pull request #11 from kmattimo/master
restored ability to use custom mime.types
2015-12-24 13:17:24 +01:00
Kyle Mattimore
7d773187bb restored ability to use custom mime.types 2015-12-23 14:14:33 -05:00
Florian Heinemann
847b25b51d Merge pull request #10 from jonbjornn/master
Update PCRE version to fix broken compile step
2015-12-04 23:00:15 +01:00
Jon
12fe84ae6b Update PCRE version to fix broken compile step 2015-12-04 09:34:49 -08:00
Michael Hobbs
d1cccfc747 Merge pull request #3 from dokku/mh-nginx-root
change ROOT env var and doc it
2015-11-25 10:43:18 -08:00
Michael Hobbs
ccbb3d7ed5 change ROOT env var and doc it 2015-11-25 10:43:01 -08:00
Michael Hobbs
61c95d52d8 Merge pull request #2 from florianheinemann/master
florianheinemann updates
2015-11-25 10:22:57 -08:00
Michael Hobbs
1ccb4948f0 Merge pull request #1 from michaelshobbs/master
update pcre to 8.38
2015-11-25 09:02:28 -08:00
Michael Hobbs
9fe1e83a46 update pcre to 8.38 2015-11-24 17:19:39 -08:00
Florian Heinemann
805e24be7f Merge pull request #9 from portokallidis/patch-1
Add documentation for nginx custom configuration
2015-10-30 13:15:32 +01:00
Nick Portokallidis
624cd06847 Add documentation for nginx custom configuration 2015-10-30 13:56:00 +02:00
Florian Heinemann
7a023ab687 Merge pull request #8 from btkostner/master
added ROOT variable
2015-10-10 22:45:21 +02:00
Blake Kostner
69e450813e added ROOT param 2015-10-05 17:09:58 -07:00
Florian Heinemann
b1370b9c56 Merge pull request #7 from Crispy1975/hotfix/path-test
Hotfix/path test
2015-09-11 11:50:51 +08:00
Paul C
caa17b7718 Testing paths from other pack. 2015-09-10 18:57:55 +01:00
Florian Heinemann
9da922ee28 Merge pull request #4 from Downchuck/master
Use full path of nginx executable
2015-07-27 14:39:23 -04:00
Iliya Tovstyonok
770f4feb42 Merge pull request #1 from florianheinemann/master
Last commits
2015-07-22 02:23:24 +03:00
Florian Heinemann
56bd6c514d Merge pull request #6 from Crispy1975/hotfix/fix-override
Fixing nginx user override.
2015-07-04 21:12:37 -04:00
Paul Caselton
23e4a8ab42 Removing rm line 2015-07-04 23:51:02 +01:00
Paul Caselton
ebbc9098d9 Fixing nginx user override. 2015-07-04 23:04:54 +01:00
Florian Heinemann
1955dcaa72 Merge pull request #5 from Crispy1975/feature/inject-conf
Check for user defined nginx config
2015-07-03 23:10:43 -04:00
Paul Caselton
29bc30b8d3 Check for user defined nginx config 2015-07-03 22:23:06 +01:00
Charles Pritchard
969446ca04 Use full path of nginx executable 2015-03-27 16:34:46 -07:00
Morton Jonuschat
fe21907d48 Update the buildpack to conform to the latest Heroku API
Heroku has deprecated the config_vars key in .release a long time
ago and recommends settings config vars using a shell script in
`.profile.d`.

This patch updates `bin/compile` to create the recommended file and
removes the config_vars key from the `.release` file.
2015-02-19 00:12:15 +01:00
Florian Heinemann
56250a7453 Update README.md 2015-02-15 11:54:16 -05:00
Florian Heinemann
d94786dcdf Merge pull request #2 from beedesk/master
Made script only copy web files from root when `www` folder is unavailable
2015-01-05 15:48:57 -05:00
Florian Heinemann
4f3662aaf1 Update README.md 2015-01-05 15:41:24 -05:00
Florian Heinemann
92dad3091b Change to PCRE 8.36 2015-01-05 15:38:35 -05:00
Thomas @ BeeDesk
746b5b88ea Made script only copy web file from root when www folder is not available. 2015-01-03 12:26:44 -08:00
Florian Heinemann
d8e108e21e Merge pull request #1 from michaelshobbs/master
make compatible with dokku checks plugin
2014-12-21 14:30:47 +01:00
Michael Hobbs
e343961ea8 make compatible with dokku checks plugin 2014-12-20 16:53:34 -08:00
Florian Heinemann
548f6a84d6 Update README.md 2014-12-13 18:28:12 +01:00
Florian Heinemann
6ed8f5fa6d Update README.md 2014-11-18 19:32:20 -05:00
Florian Heinemann
1ed618d5f3 Update README.md 2014-11-18 17:30:12 -05:00
Florian Heinemann
9dbc484b6c UPDATE Readme 2014-11-06 17:32:49 -05:00
Florian Heinemann
5c959aaad6 CHANGE to static compile 2014-11-06 17:29:41 -05:00
Florian Heinemann
51b16c2175 Port 2014-11-05 22:54:22 -05:00
Florian Heinemann
a0e955806e Port changed 2014-11-05 22:46:00 -05:00