upgrade to using nginx yum repo and bump to 1.10.1 version (security reasons)

Author: GregTurner

.s2i/bin/assemble

@@ -88,7 +88,7 @@ test_config() {
     envsubst_config
 
     echo "---> testing config"
-    if ! $NGINX_BASE_DIR/usr/sbin/nginx -c /opt/app-root/etc/nginx.conf -t ; then
+    if ! $NGINX_BASE_DIR/nginx -c /opt/app-root/etc/nginx.conf -t ; then
         echo "nginx configuration not valid."
         echo
         for f in /opt/app-root/etc/nginx.conf.d/*; do

.s2i/bin/run

@@ -26,4 +26,4 @@ envsubst_config() {
 
 envsubst_config
 
-exec ${NGINX_BASE_DIR}/usr/sbin/nginx -c "$NGINX_CONF"
+exec ${NGINX_BASE_DIR}/nginx -c "$NGINX_CONF"

Dockerfile

@@ -2,25 +2,25 @@ FROM openshift/base-centos7
 
 MAINTAINER Greg Turner <[email protected]>
 
-ENV NGINX_VERSION 1.8
-ENV NGINX_BASE_DIR /opt/rh/rh-nginx18/root
-ENV NGINX_VAR_DIR /var/opt/rh/rh-nginx18
+ENV NGINX_BASE_DIR /usr/sbin
+ENV NGINX_VAR_DIR /var
 
 LABEL io.k8s.description="Nginx static file server and reverse proxy" \
-      io.k8s.display-name="nginx builder ${NGINX_VERSION}" \
+      io.k8s.display-name="nginx builder" \
       io.openshift.expose-services="8080:http" \
       io.openshift.tags="builder,nginx,webserver"
 
+COPY ./etc/yum.repos.d/nginx.repo /opt/app-root/etc/yum.repos.d/ngnix.repo
 
 RUN yum install --setopt=tsflags=nodocs -y centos-release-scl-rh \
- && yum install --setopt=tsflags=nodocs -y bcrypt rh-nginx${NGINX_VERSION/\./} \
+ && yum install --setopt=tsflags=nodocs -y bcrypt nginx \
  && yum clean all -y \
- && mkdir -p /opt/app-root/etc/nginx.conf.d /opt/app-root/run \
+ && mkdir -p /opt/app-root/etc/nginx.conf.d /opt/app-root/run $NGINX_VAR_DIR/cache/nginx \
  && chmod -R a+rx  $NGINX_VAR_DIR/lib/nginx \
  && chmod -R a+rwX $NGINX_VAR_DIR/lib/nginx/tmp \
-                   $NGINX_VAR_DIR/log \
+                   $NGINX_VAR_DIR/log/nginx \
                    $NGINX_VAR_DIR/run \
-				   $NGINX_VAR_DIR/cache \
+				   $NGINX_VAR_DIR/cache/nginx \
                    /opt/app-root/run
 
 COPY ./etc/ /opt/app-root/etc

etc/nginx.conf

@@ -6,7 +6,7 @@ events {
     worker_connections  1024;
 }
 http {
-    include       /etc/opt/rh/rh-nginx18/nginx/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
                       '$status $body_bytes_sent "$http_referer" '
@@ -18,7 +18,7 @@ http {
     keepalive_timeout  65;
     server_name_in_redirect off;
     port_in_redirect off;
-    proxy_cache_path /var/opt/rh/rh-nginx18/cache levels=1:2 keys_zone=globalcache:10m max_size=1g inactive=60m use_temp_path=off;
+    proxy_cache_path /var/cache/nginx levels=1:2 keys_zone=globalcache:10m max_size=1g inactive=60m use_temp_path=off;
 
     include       /opt/app-root/etc/nginx.conf.d/*.conf;
 }

etc/yum.repos.d/nginx.repo

@@ -0,0 +1,5 @@
+[nginx]
+name=nginx repo
+baseurl=http://nginx.org/packages/centos/7/x86_64/
+gpgcheck=0
+enabled=1