fix(router): change nginx directory to /opt/nginx.

Author: aledbf

router/Dockerfile

@@ -21,6 +21,6 @@ CMD ["/app/bin/boot"]
 
 ADD . /app
 
-ADD nginx.tgz /nginx
+ADD nginx.tgz /opt/nginx
 
 RUN rm nginx.tgz

router/bin/boot

@@ -47,7 +47,7 @@ etcd_set_default gzipTypes "application/x-javascript application/xhtml+xml appli
 
 # spawn the service in the background
 echo "Starting Nginx..."
-/nginx/sbin/nginx &
+/opt/nginx/sbin/nginx &
 SERVICE_PID=$!
 
 # smart shutdown on SIGINT and SIGTERM

router/bin/check

@@ -7,6 +7,6 @@ if grep -q "<no value>" $1 ; then
 	exit 1
 fi
 
-if ! /nginx/sbin/nginx -t -c $1 ; then
+if ! /opt/nginx/sbin/nginx -t -c $1 ; then
 	exit 1
 fi

router/conf.d/nginx.conf.toml

@@ -1,6 +1,6 @@
 [template]
 src   = "nginx.conf"
-dest  = "/nginx/conf/nginx.conf"
+dest  = "/opt/nginx/conf/nginx.conf"
 uid = 0
 gid = 0
 mode  = "0644"
@@ -12,4 +12,4 @@ keys = [
   "/deis/builder",
 ]
 check_cmd  = "/app/bin/check {{ .src }}"
-reload_cmd = "/nginx/sbin/nginx -s reload"
+reload_cmd = "/opt/nginx/sbin/nginx -s reload"

router/parent/Dockerfile

@@ -4,4 +4,4 @@ ADD . /tmp
 
 RUN /tmp/build.sh
 
-RUN tar -C /nginx -czf /nginx.tgz .
+RUN tar -C /opt/nginx -czf /nginx.tgz .

router/parent/build.sh

@@ -6,7 +6,7 @@ export VERSION_TCP_PROXY=0.4.5
 export BUILD_PATH=/tmp/build
 
 # nginx installation directory
-export PREFIX=/nginx
+export PREFIX=/opt/nginx
 
 rm -rf $PREFIX
 mkdir $PREFIX

router/templates/nginx.conf

@@ -19,7 +19,7 @@ http {
     types_hash_max_size 2048;
     server_names_hash_bucket_size 64;
 
-    include /nginx/conf/mime.types;
+    include /opt/nginx/conf/mime.types;
     default_type application/octet-stream;
     {{ if .deis_router_gzip }}
     gzip {{ .deis_router_gzip }};