From 4beef1511bebf886ccb4f67c4cae0fc72bd4f341 Mon Sep 17 00:00:00 2001 From: Richard Allred <richardmallred@gmail.com> Date: Thu, 27 Jun 2019 05:30:50 +0200 Subject: [PATCH] Merge branch 'master' of github.com:RedHatTraining/DO288-apps --- hello-world-nginx/nginxconf.sed | 5 +++++ hello-world-nginx/Dockerfile | 19 +++++++++++++++++++ hello-world-nginx/index.html | 5 +++++ simple-pipeline/Jenkinsfile | 8 ++++---- 4 files changed, 33 insertions(+), 4 deletions(-) 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 @@ +<html> + <body> + <h1>Hello, world from nginx!</h1> + </body> +</html> 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;%% 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 @@ stage('stage 3') { steps { sh 'echo hello from stage 3!. This is the last stage...' - } // steps - } // stage + } + } - } // stages -} // pipeline + } +} -- Gitblit v1.9.3