CHANGE to static compile

README.md

@@ -1,13 +1,8 @@
-# NGINX Buildpack
+Dokku buildpack: Static Nginx
+================================
 
-**Note**: This has only been tested with [dokku](https://github.com/progrium/dokku) - it may not work elsewhere.
+For your static HTML site!
 
-## Structure
-* .nginx - File: its presence signals that this buildpack should be used
-* www - Folder: holds all files to be served by nginx
-* nginx.conf.erb - Optional File: overrides `conf/nginx.conf.erb`
-* mime.types - Optional File: overrides `conf/mime.types`
-* custom-build - Optional File: executes commands before build is finished. Note that this script does not run in the application root. To execute commands in the application root you must do `cd "$1"`.
+Simply use this as the Dokku buildpack for your static repo and push to your Dokku server!
 
-## Environment Variables
-* root - Optional: overrides root directory
+Make sure you have a file called `.static` in your root folder of your application.

bin/compile

@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
-set -e
+# bin/compile <build-dir> <cache-dir>
 
+set -e
+set -o pipefail
+
+# Nginx 1.6.2
 NGINX_VERSION="1.6.2"
 NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz"
 PCRE_VERSION="8.34"
@@ -8,37 +12,48 @@ PCRE_TARBALL="pcre-${PCRE_VERSION}.tar.gz"
 ZLIB_VERSION="1.2.8"
 ZLIB_TARBALL="zlib-${ZLIB_VERSION}.tar.gz"
 
-BINDIR=$(dirname "$0")
-BUILDDIR="${1}"
-CACHEDIR="${2}"
+# parse and derive params
+BUILD_DIR=$1
+CACHE_DIR=$2
+CUR_DIR=`cd $(dirname $0); cd ..; pwd`
 
-mkdir -p $CACHEDIR/www_cache
-mv $BUILDDIR/* $CACHEDIR/www_cache
-mkdir -p $BUILDDIR/www
-mv $CACHEDIR/www_cache/* $BUILDDIR/www
+mkdir -p $BUILD_DIR $CACHE_DIR
 
-cd $CACHEDIR
+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
+rm -rf $CACHE_DIR/www
+
+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}"
-  tar xvzf "${NGINX_TARBALL}" && rm -f "${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}"
-  tar xvzf "${PCRE_TARBALL}" && rm -f "${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}"
-  tar xvzf "${ZLIB_TARBALL}" && rm -rf "${ZLIB_TARBALL}"
+  tar xzf "${ZLIB_TARBALL}" && rm -rf "${ZLIB_TARBALL}"
 fi
 
 cd "nginx-${NGINX_VERSION}"
-mkdir $BUILDDIR/nginx
+if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then
+  echo "-----> compile static nginx"
+  mkdir $BUILD_DIR/nginx
   ./configure \
     --with-cpu-opt=generic \
-  --prefix=$BUILDDIR/nginx \
+    --prefix=$BUILD_DIR/nginx \
     --with-pcre=../pcre-${PCRE_VERSION} \
     --sbin-path=. \
     --pid-path=./nginx.pid \
@@ -77,15 +92,36 @@ mkdir $BUILDDIR/nginx
    
   sed -i "/CFLAGS/s/ \-O //g" objs/Makefile
 
-make
-make install
+  make && make install
 
-rm -rf "nginx-${NGINX_VERSION}"
+  rm -rf $CACHE_DIR/bin && mkdir -p $CACHE_DIR/bin/
+  cp -r $BUILD_DIR/nginx/* $CACHE_DIR/bin/
 
-if [[ ! -f $BUILDDIR/nginx.conf ]]; then
-    cp $BINDIR/../conf/nginx.conf $BUILDDIR/nginx.conf
+else
+  echo "-----> reuse nginx from cache"
+  mkdir -p $BUILD_DIR/nginx
+  cp -r $CACHE_DIR/bin/* $BUILD_DIR/nginx/
 fi
 
-if [[ ! -f $BUILDDIR/mime.types ]]; then
-	cp $BINDIR/../conf/mime.types $BUILDDIR/mime.types
-fi
+cd $CUR_DIR
+
+# build nginx config unless overridden by user
+#if [ ! -f $BUILD_DIR/nginx/nginx.conf ] ; then
+echo "-----> using default nginx.conf.erb"
+cp conf/nginx.conf.erb $BUILD_DIR/nginx/nginx.conf.erb
+#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
+
+# 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
+exec nginx -p /app/nginx -c /app/nginx/nginx.conf
+EOF
+chmod +x "$BUILD_DIR/start_nginx"

bin/detect

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -e
 
-if [[ -f $1/.nginx ]]; then
-  echo ".nginx"
+if [[ -f $1/.static ]]; then
+  echo ".static"
   exit 0
 else
   exit 1

bin/release

@@ -1,8 +1,12 @@
 #!/usr/bin/env bash
-set -e 
+# bin/release <build-dir>
 
 cat <<EOF
 ---
+
+addons:
+config_vars:
+  PATH: /usr/local/bin:/usr/bin:/bin:/app/nginx
 default_process_types:
-  web: sed -i "s/<PORT>/\$PORT/g" /app/nginx.conf && /app/nginx/nginx -c /app/nginx.conf
+  web: /app/start_nginx
 EOF

conf/nginx.conf

@@ -11,7 +11,7 @@ http {
   types_hash_max_size 2048;
   include mime.types;
   server {
-		listen <PORT>;
+    listen <%= ENV["PORT"] %>;
     server_name  _;
     root /app/www;
     index index.html;