From 308f9cf567be5b226e7d6ce6637b7fd9b5bdccc6 Mon Sep 17 00:00:00 2001
From: Adnan Abdulhussein <adnan@bitnami.com>
Date: Tue, 2 Jun 2015 17:06:41 -0700
Subject: [PATCH] Convert nginx over to using install script

---
 bitnami/nginx/Dockerfile      | 26 ++++++++------------------
 bitnami/nginx/entrypoint.sh   |  4 ++--
 bitnami/nginx/post-install.sh | 17 +++++++++++++++++
 3 files changed, 27 insertions(+), 20 deletions(-)
 create mode 100644 bitnami/nginx/post-install.sh

diff --git a/bitnami/nginx/Dockerfile b/bitnami/nginx/Dockerfile
index 0cf6bac6f01f..e0391bcd6fac 100644
--- a/bitnami/nginx/Dockerfile
+++ b/bitnami/nginx/Dockerfile
@@ -1,28 +1,18 @@
 FROM ubuntu-debootstrap:14.04
 MAINTAINER Bitnami
 
-ENV APP_VERSION 1.8.0-0
+ENV BITNAMI_APP_NAME nginxstandalonestack
+ENV BITNAMI_APP_VERSION 1.8.0-0
+ENV BITNAMI_APP_DIRNAME nginx
 
-RUN apt-get update -q && DEBIAN_FRONTEND=noninteractive apt-get install -qy wget && \
-    wget -q --no-check-certificate https://downloads.bitnami.com/files/download/containers/nginxstandalonestack/bitnami-nginxstandalonestack-${APP_VERSION}-linux-x64-installer.run -O /tmp/installer.run && \
-    chmod +x /tmp/installer.run && \
-    /tmp/installer.run --mode unattended --prefix /opt/bitnami && \
-    rm /opt/bitnami/ctlscript.sh /opt/bitnami/use_nginxstandalonestack && \
-    DEBIAN_FRONTEND=noninteractive apt-get --purge autoremove -qy wget && apt-get clean && rm -rf /var/lib/apt && rm -rf /var/cache/apt/archives/*
+ADD https://storage.googleapis.com/bitnami-artifacts/install.sh?GoogleAccessId=432889337695-e1gggo94k5qubupjsb35tajs91bdu0hg@developer.gserviceaccount.com&Expires=1434934078&Signature=QNkAu%2F8E2RlalSQy4n1sxMhsGKF%2FVltr6zu65HU6A9H0HKOgl6u9etqy9w6OwD4DsLMxYuy2uymOK3iDc5RbfkAMncKI1zJpxcwRQ4Mt43Oe8PBXKbQYcZ7mQaYPtpnjYblDs1S2p12Pu5NTDJHK2hJ1MrIUYwBup5n60R6OJRI%3D /tmp/install.sh
+ADD post-install.sh /tmp/post-install.sh
 
-ADD vhosts/* /opt/bitnami/nginx/conf/vhosts/
+RUN sh /tmp/install.sh
 
-RUN echo "include "/opt/bitnami/nginx/conf/vhosts/*.conf";" > /opt/bitnami/nginx/conf/bitnami/bitnami-apps-vhosts.conf && \
-    mv /opt/bitnami/nginx/conf /opt/bitnami/nginx/conf.defaults && \
-    mv /opt/bitnami/nginx/html /opt/bitnami/nginx/html.defaults && \
-    ln -s /opt/bitnami/nginx/conf/ /conf && \
-    ln -s /opt/bitnami/nginx/logs/ /logs && \
-    ln -s /opt/bitnami/nginx/html/ /app && \
-    ln -sf /dev/stdout /opt/bitnami/nginx/logs/access.log && \
-    ln -sf /dev/stderr /opt/bitnami/nginx/logs/error.log
+ADD vhosts/* /usr/local/bitnami/nginx/conf.defaults/vhosts/
 
-
-ENV PATH /opt/bitnami/nginx/sbin:/opt/bitnami/common/bin:$PATH
+ENV PATH /usr/local/bitnami/nginx/sbin:/usr/local/bitnami/common/bin:$PATH
 
 EXPOSE 80 443
 VOLUME ["/logs", "/conf", "/app"]
diff --git a/bitnami/nginx/entrypoint.sh b/bitnami/nginx/entrypoint.sh
index 098775ca34aa..b2917fb411cd 100755
--- a/bitnami/nginx/entrypoint.sh
+++ b/bitnami/nginx/entrypoint.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 if [ ! "$(ls -A /conf)" ]; then
-  cp -r /opt/bitnami/nginx/conf.defaults/* /opt/bitnami/nginx/conf
+  cp -r /usr/local/bitnami/nginx/conf.defaults/* /usr/local/bitnami/nginx/conf
 fi
 
 if [ ! "$(ls -A /app)" ]; then
-  cp -r /opt/bitnami/nginx/html.defaults/* /opt/bitnami/nginx/html
+  cp -r /usr/local/bitnami/nginx/html.defaults/* /usr/local/bitnami/nginx/html
 fi
 exec "$@"
diff --git a/bitnami/nginx/post-install.sh b/bitnami/nginx/post-install.sh
new file mode 100644
index 000000000000..efe667c18be6
--- /dev/null
+++ b/bitnami/nginx/post-install.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+INSTALL_DIR=$1
+cd $INSTALL_DIR
+
+# Backup default conf/html
+mv conf conf.defaults
+mv html html.defaults
+
+# Setup mount point symlinks
+ln -s /usr/local/bitnami/nginx/conf /conf
+ln -s /usr/local/bitnami/nginx/logs /logs
+ln -s /usr/local/bitnami/nginx/html /app
+
+# Log to stdout
+ln -sf /dev/stdout logs/access.log
+ln -sf /dev/stderr logs/error.log