From 15dedb60b6208aafdfb2328a93543e3d94500978 Mon Sep 17 00:00:00 2001
From: fmenesesg <fmeneses@redhat.com>
Date: Sun, 25 Apr 2021 16:16:28 -0400
Subject: [PATCH] Update nginx.conf to be compatible with nginx imagestreams on
 OCP 4.6 + (#161)

* Update nginx.conf to be compatible with nginx-1.16

* Update template.yaml to use nginx:1.18-ubi8 imagestream

* Change imagestream version to nginx:1.16-el8
---
 basic-nginx/.openshift/builds/template.yml |  2 +-
 basic-nginx/nginx.conf                     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/basic-nginx/.openshift/builds/template.yml b/basic-nginx/.openshift/builds/template.yml
index 3a88ce56..3805ab01 100644
--- a/basic-nginx/.openshift/builds/template.yml
+++ b/basic-nginx/.openshift/builds/template.yml
@@ -126,4 +126,4 @@ parameters:
 - description: Image stream tag for the image you'd like to use to build the application
   name: IMAGE_STREAM_TAG_NAME
   required: true
-  value: nginx:1.14
+  value: nginx:1.16-el8
diff --git a/basic-nginx/nginx.conf b/basic-nginx/nginx.conf
index 70b548a7..f67b3b31 100644
--- a/basic-nginx/nginx.conf
+++ b/basic-nginx/nginx.conf
@@ -5,10 +5,10 @@
 
 worker_processes auto;
 error_log stderr;
-pid /var/opt/rh/rh-nginx114/run/nginx/nginx.pid;
+pid /run/nginx.pid;
 
-# Load dynamic modules. See /opt/rh/rh-nginx114/root/usr/share/doc/README.dynamic.
-include /opt/rh/rh-nginx114/root/usr/share/nginx/modules/*.conf;
+# Load dynamic modules. See /usr/share/doc/nginx/README.dynamic.
+include /usr/share/nginx/modules/*.conf;
 
 events {
     worker_connections  1024;
@@ -25,7 +25,7 @@ http {
     keepalive_timeout  65;
     types_hash_max_size 2048;
 
-    include       /etc/opt/rh/rh-nginx114/nginx/mime.types;
+    include             /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
     # Load modular configuration files from the /etc/nginx/conf.d directory.
@@ -69,4 +69,4 @@ http {
         location = /50x.html {
         }
     }
-}
\ No newline at end of file
+}