kawaiipunk/buildpack-nginx
1
0
Fork 0
mirror of https://github.com/dokku/buildpack-nginx.git synced 2025-06-26 18:40:45 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: kawaiipunk:v6
Branches Tags
kawaiipunk:master
kawaiipunk:v26 kawaiipunk:v25 kawaiipunk:v24 kawaiipunk:v23 kawaiipunk:v22 kawaiipunk:v21 kawaiipunk:v20 kawaiipunk:v19 kawaiipunk:v18 kawaiipunk:v17 kawaiipunk:v16 kawaiipunk:v15 kawaiipunk:v14 kawaiipunk:v13 kawaiipunk:v12 kawaiipunk:v11 kawaiipunk:v10 kawaiipunk:v9 kawaiipunk:v8 kawaiipunk:v7 kawaiipunk:v6 kawaiipunk:v5 kawaiipunk:v4 kawaiipunk:v3
..
compare: kawaiipunk:v8
Branches Tags
kawaiipunk:master
kawaiipunk:v26 kawaiipunk:v25 kawaiipunk:v24 kawaiipunk:v23 kawaiipunk:v22 kawaiipunk:v21 kawaiipunk:v20 kawaiipunk:v19 kawaiipunk:v18 kawaiipunk:v17 kawaiipunk:v16 kawaiipunk:v15 kawaiipunk:v14 kawaiipunk:v13 kawaiipunk:v12 kawaiipunk:v11 kawaiipunk:v10 kawaiipunk:v9 kawaiipunk:v8 kawaiipunk:v7 kawaiipunk:v6 kawaiipunk:v5 kawaiipunk:v4 kawaiipunk:v3

4 Commits
v6 ... v8

Author SHA1 Message Date
Michael Hobbs
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
Jose Diaz-Gonzalez
c8ab63c69b Merge pull request #13 from larose/nginx-conf 
Use app-nginx.conf.sigil if provided
 2016-12-07 11:20:37 -07:00
Mathieu Larose
c2748f137e Use app-nginx.conf.sigil if provided 2016-12-06 22:14:24 -05:00
1 changed files with 3 additions and 4 deletions
Expand all files Collapse all files

7
bin/compile
View File

@ -8,7 +8,7 @@ PCRE_VERSION="8.39"
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.9"
ZLIB_TARBALL="zlib-${ZLIB_VERSION}.tar.gz" ZLIB_TARBALL="zlib-${ZLIB_VERSION}.tar.gz"
suppress() { suppress() {
@ -60,7 +60,7 @@ 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"
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
@ -142,10 +142,9 @@ cd "$CUR_DIR"
if [ -f "$BUILD_DIR/app-nginx.conf.sigil" ] ; then if [ -f "$BUILD_DIR/app-nginx.conf.sigil" ] ; then
echo "-----> Using user provided app-nginx.conf.sigil" echo "-----> Using user provided app-nginx.conf.sigil"
cp "$BUILD_DIR/app-nginx.conf.sigil" "$BUILD_DIR/nginx/app-nginx.conf.sigil" cp "$BUILD_DIR/app-nginx.conf.sigil" "$BUILD_DIR/nginx/app-nginx.conf.sigil"
fi
# Allow deprecated nginx.conf.erb # Allow deprecated nginx.conf.erb
if [ -f "$BUILD_DIR/nginx.conf.erb" ] ; then elif [ -f "$BUILD_DIR/nginx.conf.erb" ] ; then
echo "-----> DEPRECATED: using user provided nginx.conf.erb" echo "-----> DEPRECATED: using user provided nginx.conf.erb"
cp "$BUILD_DIR/nginx.conf.erb" "$BUILD_DIR/nginx/nginx.conf.erb" cp "$BUILD_DIR/nginx.conf.erb" "$BUILD_DIR/nginx/nginx.conf.erb"