Compare commits

..
34 Commits
Author SHA1 Message Date
Jose Diaz-GonzalezandGitHub aa0ebb8f47 Update README.md 2021-03-22 01:19:04 -04:00
Jose Diaz-GonzalezandGitHub d5048c5fe3 Merge pull request #44 from vieditcom/patch-1
Update README.md - Typo
2020-11-23 10:14:28 -05:00
Viedit comandGitHub ec734ad787 Update README.md - Typo
seperate > separate
2020-11-22 13:07:12 +03:00
Jose Diaz-GonzalezandGitHub 150d82865b Merge pull request #42 from sent-hil/master
Update Readme to include example for setting NGINX_ROOT
2020-07-14 10:24:25 -04:00
Senthil Arivudainambi cd84b47fd1 Update Readme to include example for setting NGINX_ROOT 2020-07-05 18:17:34 -07:00
Jose Diaz-GonzalezandGitHub e06b1e4df1 Merge pull request #41 from dokku/40-charset
feat: use charset utf8 by default
2020-06-11 15:33:44 -04:00
Jose Diaz-GonzalezandGitHub 0d2e4c3ee6 feat: use charset utf-8 by default
Closes #40
2020-06-11 15:33:31 -04:00
Jose Diaz-GonzalezandGitHub 1f534f7bc6 feat: enable the charset module by default 2020-06-11 15:31:47 -04:00
Jose Diaz-GonzalezandGitHub 149f06c3b3 Merge pull request #39 from pawurb/real_ip_module
Add real ip and proxy module
2020-04-13 12:36:17 -04:00
pawurb 99d72cc005 Add real ip and proxy module 2020-02-09 11:59:08 +01:00
Jose Diaz-GonzalezandGitHub 46d850193d fix: update message to say http instead of ftp
It's actually now downloading via ftp.
2019-08-19 15:44:16 -04:00
Jose Diaz-GonzalezandGitHub 9eae441352 Merge pull request #38 from vkurup/master
Update PCRE URL
2019-08-12 11:08:21 -04:00
Jose Diaz-GonzalezandGitHub b0ce745a1b chore: switch to https
The ftp url is simply an alias for the https version...
2019-08-12 11:08:13 -04:00
Vinod Kurup fe3a5dc54f Update PCRE URL 2019-08-11 20:52:38 -04:00
Jose Diaz-GonzalezandGitHub ad8d7c4261 Merge pull request #34 from justintemps/patch-1
Add text/vtt mime type for caption files
2019-06-17 09:55:47 -05:00
Jose Diaz-GonzalezandGitHub e8e0807a2d Merge pull request #36 from OldhamMade/feature/version-bump-of-dependencies
Update dependency versions
2019-06-17 09:55:28 -05:00
Phillip Oldham 673fd38bb2 Version bump of dependencies
- ensure pcre is requested via FTP
- bump pcre to 8.43
- bump nginx to 1.17.0
2019-06-16 09:39:00 +02:00
Justin SmithandGitHub 1945cf3645 Add text/vtt mime type for caption files
Update to include text/vtt mime type
2019-01-11 15:11:58 +01:00
Jose Diaz-GonzalezandGitHub a9b3cb1767 Merge pull request #29 from pawurb/update-nginx
Update nginx to 1.14.0
2018-08-29 09:12:05 -04:00
pawurb c6b3e74808 Update nginx to 1.14.0 2018-06-03 20:36:58 +02:00
Jose Diaz-GonzalezandGitHub ffaa249c5c Merge pull request #21 from ineffyble/master
Add port_in_redirect directive to NGINX configuration template
2017-12-18 10:55:33 -05:00
Jose Diaz-GonzalezandGitHub e31fee35bb Merge pull request #26 from nreilly/patch-1
New download location for PCRE
2017-07-16 15:32:33 -06:00
nreillyandGitHub 0b290ce1f6 New download location for PCRE
Changing to a new mirror that has updated packages.
2017-07-16 14:29:27 +08:00
Jose Diaz-GonzalezandGitHub ec0560066c Merge pull request #24 from jtstio/master
Update PCRE to 8.40 and zlib to 1.2.11
2017-07-09 21:25:44 -06:00
Florian HeinemannandJames Hale f873fe2024 UPDATE pcre and zlib 2017-07-09 09:00:31 -06:00
antoine-duchenetandJames Hale 9a82e569c1 Update Zlib to version 1.2.10 2017-07-09 08:59:58 -06:00
Effy Elden 6ecc56df72 Add port_in_redirect directive to NGINX configuration template 2017-04-15 00:29:37 +10:00
Jose Diaz-GonzalezandGitHub ed184f98fd Update README.md 2017-03-28 17:42:13 -06:00
Jose Diaz-GonzalezandGitHub 2535bd6ebb Merge pull request #16 from timaschew/patch-1
update docs how to set buildback
2017-01-10 11:07:12 -07:00
Anton WilhelmandGitHub 6d1ae20708 update docs how to set buildback 2017-01-10 03:52:33 +01:00
Jose Diaz-GonzalezandGitHub dded3b0717 Merge pull request #15 from shovon/patch-1
Update to instruction for manual setup
2017-01-05 12:25:51 -05:00
Sal RahmanandGitHub d4f93ae2b3 Update to instruction for manual setup
Manual setup used the wrong command; the parameter with application name was missing. This change adds that.
2017-01-05 03:48:38 -08:00
Michael HobbsandGitHub 51f642dcff Merge pull request #14 from kblcuk/master
Push zlib version to 1.2.9
2017-01-02 17:05:21 -08:00
Alexei Mikhailov 0a46959ef7 Push zlib version to 1.2.9
Also fetch it from github releases rather than site directly; those
releases won't suddenly disappear.
2017-01-02 17:22:55 +02:00
4 changed files with 19 additions and 18 deletions
+5 -6
View File
@@ -1,17 +1,16 @@
# Dokku Buildpack: nginx # heroku-buildpack-nginx
This is the official dokku buildpack for static websites, powered by nginx. This is the official dokku buildpack for static websites, powered by nginx.
## Usage ## Usage
All static files that you want to serve should be in the root directory of your repository. No need to use a seperate `www` folder. `buildpack-nginx` will automatically download the buildpack, download NGINX, compile it, and install it. The next time you push your project, the buildpack will reuse the precompiled binaries. All static files that you want to serve should be in the root directory of your repository. No need to use a separate `www` folder. `buildpack-nginx` will automatically download the buildpack, download NGINX, compile it, and install it. The next time you push your project, the buildpack will reuse the precompiled binaries.
### Dokku ### Dokku
To trigger detection of this buildpack in Dokku, you have two options: To trigger detection of this buildpack you need to add a dotfile:
- Automatic: Add an *empty* file called `.static` to your root directory of your web project. Add an *empty* file called `.static` to your root directory of your web project (regardless if you use a custom value for NGINX_ROOT)
- Manual: Set your `BUILDPACK_URL` via `dokku config:set BUILDPACK_URL=https://github.com/dokku/buildpack-nginx.git`
### Heroku ### Heroku
@@ -23,7 +22,7 @@ heroku buildpacks:set https://github.com/dokku/buildpack-nginx.git
## Configuration ## Configuration
You can override the nginx root via setting the `NGINX_ROOT` environment variable. This should be a relative path in your repository. You can override the nginx root via setting the `NGINX_ROOT` environment variable. This should be a relative path in your repository (for example `dokku config:set <app> NGINX_ROOT=_site` if you are deploying a Jekyll site).
You may completely override the built-in nginx config by placing an `app-nginx.conf.sigil` file in the root, modeled after our own [`conf/app-nginx.conf.sigil`](https://github.com/dokku/buildpack-nginx/blob/master/conf/app-nginx.conf.sigil). This will be used inside of the container, and not by the host Dokku instance. See the [sigil project](https://github.com/gliderlabs/sigil) for more information concerning the sigil format. You may completely override the built-in nginx config by placing an `app-nginx.conf.sigil` file in the root, modeled after our own [`conf/app-nginx.conf.sigil`](https://github.com/dokku/buildpack-nginx/blob/master/conf/app-nginx.conf.sigil). This will be used inside of the container, and not by the host Dokku instance. See the [sigil project](https://github.com/gliderlabs/sigil) for more information concerning the sigil format.
+11 -12
View File
@@ -2,13 +2,13 @@
# bin/compile <build-dir> <cache-dir> # bin/compile <build-dir> <cache-dir>
set -eo pipefail; [[ $TRACE ]] && set -x set -eo pipefail; [[ $TRACE ]] && set -x
NGINX_VERSION="1.10.1" NGINX_VERSION="1.17.0"
NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz" NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz"
PCRE_VERSION="8.39" PCRE_VERSION="8.43"
PCRE_TARBALL="pcre-${PCRE_VERSION}.tar.gz" PCRE_TARBALL="pcre-${PCRE_VERSION}.tar.gz"
SIGIL_VERSION="0.4.0" SIGIL_VERSION="0.4.0"
SIGIL_TARBALL="sigil_${SIGIL_VERSION}_Linux_x86_64.tgz" SIGIL_TARBALL="sigil_${SIGIL_VERSION}_Linux_x86_64.tgz"
ZLIB_VERSION="1.2.8" ZLIB_VERSION="1.2.11"
ZLIB_TARBALL="zlib-${ZLIB_VERSION}.tar.gz" ZLIB_TARBALL="zlib-${ZLIB_VERSION}.tar.gz"
suppress() { suppress() {
@@ -47,25 +47,25 @@ fi
cd "$CACHE_DIR" cd "$CACHE_DIR"
if [[ ! -d "${NGINX_TARBALL%.tar.gz}" ]]; then if [[ ! -d "${NGINX_TARBALL%.tar.gz}" ]]; then
echo "-----> Download and unzip nginx" echo "-----> Download and unzip nginx ${NGINX_VERSION} via http"
curl -sSL "http://nginx.org/download/${NGINX_TARBALL}" -o "${NGINX_TARBALL}" curl -sSL "http://nginx.org/download/${NGINX_TARBALL}" -o "${NGINX_TARBALL}"
tar xzf "${NGINX_TARBALL}" && rm -f "${NGINX_TARBALL}" tar xzf "${NGINX_TARBALL}" && rm -f "${NGINX_TARBALL}"
fi fi
if [[ ! -d "${PCRE_TARBALL%.tar.gz}" ]]; then if [[ ! -d "${PCRE_TARBALL%.tar.gz}" ]]; then
echo "-----> Download and unzip pcre" echo "-----> Download and unzip pcre ${PCRE_VERSION} via http"
curl -sSL "http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${PCRE_TARBALL}" -o "${PCRE_TARBALL}" curl -sSL "https://ftp.pcre.org/pub/pcre/${PCRE_TARBALL}" -o "${PCRE_TARBALL}"
tar xzf "${PCRE_TARBALL}" && rm -f "${PCRE_TARBALL}" tar xzf "${PCRE_TARBALL}" && rm -f "${PCRE_TARBALL}"
fi fi
if [[ ! -d "${ZLIB_TARBALL%.tar.gz}" ]]; then if [[ ! -d "${ZLIB_TARBALL%.tar.gz}" ]]; then
echo "-----> Download and unzip zlib" echo "-----> Download and unzip zlib ${ZLIB_VERSION} via http"
curl -sSL "http://zlib.net/${ZLIB_TARBALL}" -o "${ZLIB_TARBALL}" curl -sSL "https://github.com/madler/zlib/archive/v${ZLIB_VERSION}.tar.gz" -o "${ZLIB_TARBALL}"
tar xzf "${ZLIB_TARBALL}" && rm -rf "${ZLIB_TARBALL}" tar xzf "${ZLIB_TARBALL}" && rm -rf "${ZLIB_TARBALL}"
fi fi
if [[ ! -f "sigil" ]]; then if [[ ! -f "sigil" ]]; then
echo "-----> Download and unzip sigil" echo "-----> Download and unzip sigil ${SIGIL_VERSION} via http"
curl -sSL "https://github.com/gliderlabs/sigil/releases/download/v${SIGIL_VERSION}/${SIGIL_TARBALL}" -o "${SIGIL_TARBALL}" curl -sSL "https://github.com/gliderlabs/sigil/releases/download/v${SIGIL_VERSION}/${SIGIL_TARBALL}" -o "${SIGIL_TARBALL}"
tar xzf "${SIGIL_TARBALL}" && rm -rf "${SIGIL_TARBALL}" tar xzf "${SIGIL_TARBALL}" && rm -rf "${SIGIL_TARBALL}"
fi fi
@@ -91,7 +91,6 @@ if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then
--with-zlib=../zlib-${ZLIB_VERSION} \ --with-zlib=../zlib-${ZLIB_VERSION} \
--with-pcre \ --with-pcre \
--with-cc-opt="-O2 -static -static-libgcc" \ --with-cc-opt="-O2 -static -static-libgcc" \
--without-http_charset_module \
--without-http_ssi_module \ --without-http_ssi_module \
--without-http_userid_module \ --without-http_userid_module \
--without-http_access_module \ --without-http_access_module \
@@ -101,7 +100,6 @@ if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then
--without-http_map_module \ --without-http_map_module \
--without-http_split_clients_module \ --without-http_split_clients_module \
--without-http_referer_module \ --without-http_referer_module \
--without-http_proxy_module \
--without-http_fastcgi_module \ --without-http_fastcgi_module \
--without-http_uwsgi_module \ --without-http_uwsgi_module \
--without-http_scgi_module \ --without-http_scgi_module \
@@ -113,7 +111,8 @@ if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then
--without-http_upstream_keepalive_module \ --without-http_upstream_keepalive_module \
--without-mail_pop3_module \ --without-mail_pop3_module \
--without-mail_imap_module \ --without-mail_imap_module \
--without-mail_smtp_module --without-mail_smtp_module \
--with-http_realip_module
sed -i "/CFLAGS/s/ \-O //g" objs/Makefile sed -i "/CFLAGS/s/ \-O //g" objs/Makefile
+2
View File
@@ -10,6 +10,7 @@ events {
http { http {
types_hash_max_size 2048; types_hash_max_size 2048;
include mime.types; include mime.types;
charset UTF-8;
server { server {
listen {{ $.PORT }}; listen {{ $.PORT }};
server_name _; server_name _;
@@ -19,6 +20,7 @@ http {
root /app/www; root /app/www;
{{ end }} {{ end }}
index index.html; index index.html;
port_in_redirect off;
location / { location / {
try_files $uri $uri/ /index.html; try_files $uri $uri/ /index.html;
+1
View File
@@ -14,6 +14,7 @@ types {
text/vnd.sun.j2me.app-descriptor jad; text/vnd.sun.j2me.app-descriptor jad;
text/vnd.wap.wml wml; text/vnd.wap.wml wml;
text/x-component htc; text/x-component htc;
text/vtt vtt;
image/png png; image/png png;
image/tiff tif tiff; image/tiff tif tiff;