Merge pull request #14 from kblcuk/master

Push zlib version to 1.2.9

.gitignore

@@ -0,0 +1 @@
+.idea

Makefile

@@ -0,0 +1,20 @@
+shellcheck:
+ifeq ($(shell shellcheck > /dev/null 2>&1 ; echo $$?),127)
+ifeq ($(shell uname),Darwin)
+	brew install shellcheck
+else
+	sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse'
+	sudo apt-get update -qq && sudo apt-get install -qq -y shellcheck
+endif
+endif
+
+ci-dependencies: shellcheck
+
+lint:
+	@echo linting...
+	@$(QUIET) find ./ -maxdepth 2 -not -path '*/\.*' | xargs file | egrep "shell|bash" | awk '{ print $$1 }' | sed 's/://g' | xargs shellcheck -e SC2069
+
+setup:
+	$(MAKE) ci-dependencies
+
+test: setup lint

README.md

@@ -1,20 +1,34 @@
-# NGINX Buildpack for Dokku - Hosting static pages
-This buildpack has been successfully run on Digital Ocean instances of Ubuntu 14.04 (Status: Jan 2015). It might also work with different configurations.
+# Dokku Buildpack: nginx
 
-## Purpose
-`buildpack-nginx` provides a simple, low overhead way of hosting static pages and websites on Dokku. Just add the `.env` and `.static` file to the root directory of your website as described below.
+This is the official dokku buildpack for static websites, powered by nginx.
 
 ## Usage
-1. Add a file with the name `.env` in the root of your directory with the following content: `export BUILDPACK_URL=https://github.com/florianheinemann/buildpack-nginx.git`
-2. Add another, *empty* file called `.static` to your root directory of your web project. It signals that this buildpack shall be used
-3. Push your project to Dokku
 
 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.
 
-## NGINX CONFIGURATION
-Override default configuration by adding `nginx.conf.erb` in the root directory
+### Dokku
+
+To trigger detection of this buildpack in Dokku, you have two options:
+
+- Automatic: Add an *empty* file called `.static` to your root directory of your web project.
+- Manual: Set your `BUILDPACK_URL` via `dokku config:set BUILDPACK_URL=https://github.com/dokku/buildpack-nginx.git`
+
+### Heroku
+
+Heroku users can use this buildpack by running the following command:
+
+```
+heroku buildpacks:set https://github.com/dokku/buildpack-nginx.git
+```
+
+## Configuration
+
+You can override the nginx root via setting the `NGINX_ROOT` environment variable. This should be a relative path in your repository.
+
+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.
 
 ## Credits and License
-`buildpack-nginx` is licensed under the CC0 1.0 Universal license and has been informed by many similar projects on the web
+
+`buildpack-nginx` is licensed under the CC0 1.0 Universal license and has been informed by many similar projects on the web.
 
 [Florian Heinemann](http://twitter.com/TheSumOfAll/)

bin/compile

@@ -1,70 +1,90 @@
 #!/usr/bin/env bash
 # bin/compile <build-dir> <cache-dir>
+set -eo pipefail; [[ $TRACE ]] && set -x
 
-set -e
-set -o pipefail
-
-# Nginx 1.6.2
-NGINX_VERSION="1.6.2"
+NGINX_VERSION="1.10.1"
 NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz"
-PCRE_VERSION="8.38"
+PCRE_VERSION="8.39"
 PCRE_TARBALL="pcre-${PCRE_VERSION}.tar.gz"
-ZLIB_VERSION="1.2.8"
+SIGIL_VERSION="0.4.0"
+SIGIL_TARBALL="sigil_${SIGIL_VERSION}_Linux_x86_64.tgz"
+ZLIB_VERSION="1.2.9"
 ZLIB_TARBALL="zlib-${ZLIB_VERSION}.tar.gz"
 
+suppress() {
+  # shellcheck disable=SC2069
+  /bin/rm --force /tmp/surpress.out 2> /dev/null; "$@" 2>&1 > /tmp/surpress.out || cat /tmp/surpress.out; /bin/rm /tmp/surpress.out;
+}
+
 # parse and derive params
 BUILD_DIR=$1
 CACHE_DIR=$2
-CUR_DIR=`cd $(dirname $0); cd ..; pwd`
+CUR_DIR=$(cd "$(dirname "$0")"; cd ..; pwd)
 
-mkdir -p $BUILD_DIR $CACHE_DIR
+mkdir -p "$BUILD_DIR" "$CACHE_DIR"
 
-if [[ ! -e "$BUILD_DIR/www" ]]; then
-  echo "-----> copy static files to www"
-  rm -rf $CACHE_DIR/www
-  mkdir -p $CACHE_DIR/www
-  mv $BUILD_DIR/* $CACHE_DIR/www
-  mkdir -p $BUILD_DIR/www
-  mv $CACHE_DIR/www/* $BUILD_DIR/www
-  # Check for an copy the nginx conf file override to the build dir
-  [[ -f "$BUILD_DIR/www/nginx.conf.erb" ]] && mv $BUILD_DIR/www/nginx.conf.erb $BUILD_DIR
-  [[ -f "$BUILD_DIR/www/CHECKS" ]] && mv $BUILD_DIR/www/CHECKS $BUILD_DIR
-  rm -rf $CACHE_DIR/www
+if [[ ! -e "${BUILD_DIR}/www" ]]; then
+  echo "-----> Copy static files to www"
+  rm -rf "${CACHE_DIR}/www"
+  mkdir -p "${CACHE_DIR}/www"
+
+  # shellcheck disable=SC2086
+  mv $BUILD_DIR/* "${CACHE_DIR}/www"
+  mkdir -p "${BUILD_DIR}/www"
+
+  # shellcheck disable=SC2086
+  mv ${CACHE_DIR}/www/* "${BUILD_DIR}/www"
+  # Check for a copy the nginx conf file override to the build dir
+  [[ -f "${BUILD_DIR}/www/nginx.conf.erb" ]] && mv "${BUILD_DIR}/www/nginx.conf.erb" "${BUILD_DIR}"
+  [[ -f "${BUILD_DIR}/www/nginx.conf.sigil" ]] && mv "${BUILD_DIR}/www/nginx.conf.sigil" "${BUILD_DIR}"
+  [[ -f "${BUILD_DIR}/www/app-nginx.conf.sigil" ]] && mv "${BUILD_DIR}/www/app-nginx.conf.sigil" "${BUILD_DIR}"
+  [[ -f "${BUILD_DIR}/www/mime.types" ]] && mv "${BUILD_DIR}/www/mime.types" "${BUILD_DIR}"
+  [[ -f "${BUILD_DIR}/www/CHECKS" ]] && mv "${BUILD_DIR}/www/CHECKS" "${BUILD_DIR}"
+  [[ -f "${BUILD_DIR}/www/app.json" ]] && mv "${BUILD_DIR}/www/app.json" "${BUILD_DIR}"
+  rm -rf "${CACHE_DIR}/www"
 fi
 
-cd $CACHE_DIR
+cd "$CACHE_DIR"
 
 if [[ ! -d "${NGINX_TARBALL%.tar.gz}" ]]; then
-  echo "-----> download and unzip nginx"
-  curl "http://nginx.org/download/${NGINX_TARBALL}" -o "${NGINX_TARBALL}"
+  echo "-----> Download and unzip nginx"
+  curl -sSL "http://nginx.org/download/${NGINX_TARBALL}" -o "${NGINX_TARBALL}"
   tar xzf "${NGINX_TARBALL}" && rm -f "${NGINX_TARBALL}"
 fi
 
 if [[ ! -d "${PCRE_TARBALL%.tar.gz}" ]]; then
-  echo "-----> download and unzip pcre"
-  curl "http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${PCRE_TARBALL}" -o "${PCRE_TARBALL}"
+  echo "-----> Download and unzip pcre"
+  curl -sSL "http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${PCRE_TARBALL}" -o "${PCRE_TARBALL}"
   tar xzf "${PCRE_TARBALL}" && rm -f "${PCRE_TARBALL}"
 fi
 
 if [[ ! -d "${ZLIB_TARBALL%.tar.gz}" ]]; then
-  echo "-----> download and unzip zlib"
-  curl "http://zlib.net/${ZLIB_TARBALL}" -o "${ZLIB_TARBALL}"
+  echo "-----> Download and unzip zlib"
+  curl -sSL "https://github.com/madler/zlib/archive/v${ZLIB_VERSION}.tar.gz" -o "${ZLIB_TARBALL}"
   tar xzf "${ZLIB_TARBALL}" && rm -rf "${ZLIB_TARBALL}"
 fi
 
+if [[ ! -f "sigil" ]]; then
+  echo "-----> Download and unzip sigil"
+  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}"
+fi
+
+mkdir -p "$BUILD_DIR/sigil"
+cp -r sigil "$BUILD_DIR/sigil/"
+
 cd "nginx-${NGINX_VERSION}"
 if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then
-  echo "-----> compile static nginx"
-  mkdir $BUILD_DIR/nginx
-  ./configure \
+  echo "-----> Compiling static nginx binary"
+  mkdir "$BUILD_DIR/nginx"
+  suppress ./configure \
     --with-cpu-opt=generic \
-    --prefix=$BUILD_DIR/nginx \
+    --prefix="$BUILD_DIR/nginx" \
     --with-pcre=../pcre-${PCRE_VERSION} \
     --sbin-path=. \
     --pid-path=./nginx.pid \
     --conf-path=./nginx.conf \
     --with-ld-opt="-static" \
-    --with-http_spdy_module \
     --with-http_stub_status_module \
     --with-http_gzip_static_module \
     --with-file-aio \
@@ -97,49 +117,62 @@ if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then
 
   sed -i "/CFLAGS/s/ \-O //g" objs/Makefile
 
-  make && make install
+  suppress make && suppress make install
 
-  rm -rf $CACHE_DIR/bin && mkdir -p $CACHE_DIR/bin/
-  cp -r $BUILD_DIR/nginx/* $CACHE_DIR/bin/
+  rm -rf "${CACHE_DIR:?}/bin" && mkdir -p "$CACHE_DIR/bin/"
+  # shellcheck disable=SC2086
+  cp -r $BUILD_DIR/nginx/* "$CACHE_DIR/bin/"
 
 else
-  echo "-----> reuse nginx from cache"
-  mkdir -p $BUILD_DIR/nginx
-  cp -r $CACHE_DIR/bin/* $BUILD_DIR/nginx/
+  echo "-----> Reusing nginx binary from cache"
+  mkdir -p "$BUILD_DIR/nginx"
+  # shellcheck disable=SC2086
+  cp -r $CACHE_DIR/bin/* "$BUILD_DIR/nginx/"
 fi
 
 # Update the PATH
-mkdir -p $BUILD_DIR/.profile.d
-cat > $BUILD_DIR/.profile.d/nginx.sh <<"EOF"
+mkdir -p "$BUILD_DIR/.profile.d"
+cat > "$BUILD_DIR/.profile.d/nginx.sh" <<"EOF"
 export PATH="$PATH:$HOME/nginx"
 EOF
 
-cd $CUR_DIR
+cd "$CUR_DIR"
 
+# Add support for app-nginx.conf.sigil
+if [ -f "$BUILD_DIR/app-nginx.conf.sigil" ] ; then
+  echo "-----> Using user provided app-nginx.conf.sigil"
+  cp "$BUILD_DIR/app-nginx.conf.sigil" "$BUILD_DIR/nginx/app-nginx.conf.sigil"
 
-# Test for user override on nginx config...
-if [ -f $BUILD_DIR/nginx.conf.erb ] ; then
-  echo "-----> using user provided nginx.conf.erb"
-  cp $BUILD_DIR/nginx.conf.erb $BUILD_DIR/nginx/nginx.conf.erb
-  #rm $BUILD_DIR/nginx.conf.erb
+# Allow deprecated nginx.conf.erb
+elif [ -f "$BUILD_DIR/nginx.conf.erb" ] ; then
+  echo "-----> DEPRECATED: using user provided nginx.conf.erb"
+  cp "$BUILD_DIR/nginx.conf.erb" "$BUILD_DIR/nginx/nginx.conf.erb"
 
 # ...else, force default file
 else
-  echo "-----> using default nginx.conf.erb"
-  cp conf/nginx.conf.erb $BUILD_DIR/nginx/nginx.conf.erb
+  echo "-----> Using default app-nginx.conf.sigil"
+  cp conf/app-nginx.conf.sigil "$BUILD_DIR/nginx/app-nginx.conf.sigil"
 fi
 
 # build mime.types unless overridden by user
-#if [ ! -f $BUILD_DIR/mime.types ] ; then
-echo "-----> using default mime.types"
-cp conf/mime.types $BUILD_DIR/nginx/mime.types
-#fi
+if [ -f "$BUILD_DIR/mime.types" ] ; then
+  echo "-----> Using user provided mime.types"
+  cp "$BUILD_DIR/mime.types" "$BUILD_DIR/nginx/mime.types"
+
+else
+  echo "-----> Using default mime.types"
+  cp conf/mime.types "$BUILD_DIR/nginx/mime.types"
+fi
 
 # build a startup script
 cat <<EOF >"$BUILD_DIR/start_nginx"
 #!/usr/bin/env bash
 rm -f /app/nginx/nginx.conf
-erb /app/nginx/nginx.conf.erb > /app/nginx/nginx.conf
+if [[ -f /app/nginx/app-nginx.conf.sigil ]]; then
+  /app/sigil/sigil -f /app/nginx/app-nginx.conf.sigil NGINX_ROOT="\$NGINX_ROOT" PORT="\$PORT" | cat -s > /app/nginx/nginx.conf
+else
+  erb /app/nginx/nginx.conf.erb > /app/nginx/nginx.conf
+fi
 exec /app/nginx/nginx -p /app/nginx -c /app/nginx/nginx.conf
 EOF
 chmod +x "$BUILD_DIR/start_nginx"

bin/detect

@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
-set -e
+# bin/detect <build-dir> <cache-dir>
+set -eo pipefail; [[ $TRACE ]] && set -x
 
-if [[ -f $1/.static ]]; then
-  echo ".static"
-  exit 0
-else
+# Exit early if app is clearly not an nginx app
+if [[ ! -f "$1/.static" ]]; then
   exit 1
 fi
+
+echo ".static"

bin/release

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 # bin/release <build-dir>
+set -eo pipefail; [[ $TRACE ]] && set -x
 
 cat <<EOF
 ---
-
-addons:
+addons: []
 default_process_types:
   web: /app/start_nginx
 EOF

conf/app-nginx.conf.sigil

@@ -11,13 +11,17 @@ http {
   types_hash_max_size 2048;
   include mime.types;
   server {
-    listen <%= ENV["PORT"] %>;
+    listen {{ $.PORT }};
     server_name  _;
-    <% if ENV["ROOT"] %>
-      root /app/www/<%= ENV["ROOT"] %>;
-    <% else %>
+    {{ if ne $.NGINX_ROOT "" }}
+      root /app/www/{{ $.NGINX_ROOT }};
+    {{ else }}
       root /app/www;
-    <% end %>
+    {{ end }}
     index index.html;
+
+    location / {
+      try_files $uri $uri/ /index.html;
+    }
   }
 }