Merge branch 'master' of github.com:RedHatTraining/DO288-apps
This commit is contained in:
commit
4beef1511b
4 changed files with 33 additions and 4 deletions
19
hello-world-nginx/Dockerfile
Normal file
19
hello-world-nginx/Dockerfile
Normal file
|
|
@ -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;"
|
||||
|
||||
5
hello-world-nginx/index.html
Normal file
5
hello-world-nginx/index.html
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
<html>
|
||||
<body>
|
||||
<h1>Hello, world from nginx!</h1>
|
||||
</body>
|
||||
</html>
|
||||
5
hello-world-nginx/nginxconf.sed
Normal file
5
hello-world-nginx/nginxconf.sed
Normal file
|
|
@ -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;%%
|
||||
8
simple-pipeline/Jenkinsfile
vendored
8
simple-pipeline/Jenkinsfile
vendored
|
|
@ -30,8 +30,8 @@ pipeline {
|
|||
stage('stage 3') {
|
||||
steps {
|
||||
sh 'echo hello from stage 3!. This is the last stage...'
|
||||
} // steps
|
||||
} // stage
|
||||
}
|
||||
}
|
||||
|
||||
} // stages
|
||||
} // pipeline
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue