From 634e1920078ff7d930d5c7a6aa4f053979807fbb Mon Sep 17 00:00:00 2001
From: Miguel Martinez <miguel@bitnami.com>
Date: Thu, 11 Jun 2015 14:12:41 -0700
Subject: [PATCH] Adding integrity check

---
 bitnami/nginx/Dockerfile           | 3 ++-
 bitnami/nginx/entrypoint.sh        | 2 +-
 bitnami/nginx/installer.run.sha256 | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 bitnami/nginx/installer.run.sha256

diff --git a/bitnami/nginx/Dockerfile b/bitnami/nginx/Dockerfile
index 8169caa86d94..528040511d1a 100644
--- a/bitnami/nginx/Dockerfile
+++ b/bitnami/nginx/Dockerfile
@@ -8,8 +8,9 @@ ENV BITNAMI_APP_VERSION 1.8.0-0
 ENV BITNAMI_APP_VOL_PREFIX=/bitnami/$BITNAMI_APP_NAME
 ENV BITNAMI_APP_USER daemon
 
+COPY installer.run.sha256 /tmp/installer.run.sha256
 ADD https://www.dropbox.com/s/9rffufx3drjisl1/install.sh?dl=1 /tmp/install.sh
-ADD post-install.sh /tmp/post-install.sh
+COPY post-install.sh /tmp/post-install.sh
 
 RUN sh /tmp/install.sh
 
diff --git a/bitnami/nginx/entrypoint.sh b/bitnami/nginx/entrypoint.sh
index a04a3ce8a7f3..88407ff4679f 100755
--- a/bitnami/nginx/entrypoint.sh
+++ b/bitnami/nginx/entrypoint.sh
@@ -13,7 +13,7 @@ fi
 chown -R $BITNAMI_APP_USER:$BITNAMI_APP_USER $BITNAMI_APP_VOL_PREFIX/logs/ $BITNAMI_APP_VOL_PREFIX/conf/ /app/ || true
 
 if [ "$1" = 'nginx' ]; then
-  gosu $BITNAMI_APP_USER:$BITNAMI_APP_USER tail -f $BITNAMI_APP_VOL_PREFIX/logs/* &
+  wait_and_tail_logs &
 fi
 
 exec "$@"
diff --git a/bitnami/nginx/installer.run.sha256 b/bitnami/nginx/installer.run.sha256
new file mode 100644
index 000000000000..d4e8fb65876a
--- /dev/null
+++ b/bitnami/nginx/installer.run.sha256
@@ -0,0 +1 @@
+19afec98624c01cfd2dc79ea834bc3706cac77752187599261cdc20bce65fd89 /tmp/installer.run