1
0
mirror of https://github.com/dokku/buildpack-nginx.git synced 2025-06-26 18:40:45 +00:00

12 Commits
v9 ... v13

Author SHA1 Message Date
149f06c3b3 Merge pull request #39 from pawurb/real_ip_module
Add real ip and proxy module
2020-04-13 12:36:17 -04:00
99d72cc005 Add real ip and proxy module 2020-02-09 11:59:08 +01:00
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
9eae441352 Merge pull request #38 from vkurup/master
Update PCRE URL
2019-08-12 11:08:21 -04:00
b0ce745a1b chore: switch to https
The ftp url is simply an alias for the https version...
2019-08-12 11:08:13 -04:00
fe3a5dc54f Update PCRE URL 2019-08-11 20:52:38 -04:00
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
e8e0807a2d Merge pull request #36 from OldhamMade/feature/version-bump-of-dependencies
Update dependency versions
2019-06-17 09:55:28 -05:00
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
1945cf3645 Add text/vtt mime type for caption files
Update to include text/vtt mime type
2019-01-11 15:11:58 +01:00
a9b3cb1767 Merge pull request #29 from pawurb/update-nginx
Update nginx to 1.14.0
2018-08-29 09:12:05 -04:00
c6b3e74808 Update nginx to 1.14.0 2018-06-03 20:36:58 +02:00
2 changed files with 9 additions and 8 deletions

View File

@ -2,9 +2,9 @@
# 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.40" 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"
@ -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 "https://ftp.pcre.org/pub/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 "https://github.com/madler/zlib/archive/v${ZLIB_VERSION}.tar.gz" -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
@ -101,7 +101,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 +112,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

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;