From 9b71dda827e60a58144a0574f8af74b8868097e6 Mon Sep 17 00:00:00 2001 From: Ravi Srinivasan Date: Wed, 26 Jun 2019 16:02:15 +0530 Subject: [PATCH 1/2] Jenkinsfile cleanup --- simple-pipeline/Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/simple-pipeline/Jenkinsfile b/simple-pipeline/Jenkinsfile index 35bb55d..037ecf5 100644 --- a/simple-pipeline/Jenkinsfile +++ b/simple-pipeline/Jenkinsfile @@ -30,8 +30,8 @@ pipeline { stage('stage 3') { steps { sh 'echo hello from stage 3!. This is the last stage...' - } // steps - } // stage + } + } - } // stages -} // pipeline + } +} From c08808463901886bb09dcc782959b9cbfb72972d Mon Sep 17 00:00:00 2001 From: Student User Date: Wed, 26 Jun 2019 23:10:40 +0000 Subject: [PATCH 2/2] update of hello-world-nginx image for UBI --- hello-world-nginx/Dockerfile | 19 +++++++++++++++++++ hello-world-nginx/index.html | 5 +++++ hello-world-nginx/nginxconf.sed | 5 +++++ 3 files changed, 29 insertions(+) create mode 100644 hello-world-nginx/Dockerfile create mode 100644 hello-world-nginx/index.html create mode 100644 hello-world-nginx/nginxconf.sed diff --git a/hello-world-nginx/Dockerfile b/hello-world-nginx/Dockerfile new file mode 100644 index 0000000..c1a808d --- /dev/null +++ b/hello-world-nginx/Dockerfile @@ -0,0 +1,19 @@ +FROM registry.access.redhat.com/ubi8:8.0 + +RUN yum install -y --disableplugin=subscription-manager --nodocs nginx \ + && yum clean all + +ADD index.html /usr/share/nginx/html + +ADD nginxconf.sed /tmp/ +RUN sed -i -f /tmp/nginxconf.sed /etc/nginx/nginx.conf + +RUN touch /run/nginx.pid \ + && chgrp -R 0 /var/log/nginx /run/nginx.pid \ + && chmod -R g+rwx /var/log/nginx /run/nginx.pid + +EXPOSE 8080 +USER 1001 + +CMD nginx -g "daemon off;" + diff --git a/hello-world-nginx/index.html b/hello-world-nginx/index.html new file mode 100644 index 0000000..03717c5 --- /dev/null +++ b/hello-world-nginx/index.html @@ -0,0 +1,5 @@ + + +

Hello, world from nginx!

+ + diff --git a/hello-world-nginx/nginxconf.sed b/hello-world-nginx/nginxconf.sed new file mode 100644 index 0000000..a2d779d --- /dev/null +++ b/hello-world-nginx/nginxconf.sed @@ -0,0 +1,5 @@ +s/listen 80/listen 8080/ +s/listen \[::\]:80/listen \[::\]:8080/ +s/user nginx;// +s%error_log /var/log/nginx/error.log%error_log stderr% +s%access_log /var/log/nginx/access.log main;%%