From b21dcce9cad89d0311f17975ef5ccd58e8360020 Mon Sep 17 00:00:00 2001 From: Student User Date: Sat, 10 Dec 2022 23:47:50 -0500 Subject: [PATCH 1/5] Fixed json syntax --- nodejs-helloworld/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodejs-helloworld/package.json b/nodejs-helloworld/package.json index 338e1f7ead..29b13f406d 100644 --- a/nodejs-helloworld/package.json +++ b/nodejs-helloworld/package.json @@ -9,6 +9,6 @@ "author": "Red Hat Training", "license": "ASL", "dependencies": { - "express" "4.14.x" + "express": "4.14.x" } } From e29272bd27254879cd03ec16c2252c48f9a20a60 Mon Sep 17 00:00:00 2001 From: Student User Date: Sun, 11 Dec 2022 03:56:22 -0500 Subject: [PATCH 2/5] Fixed JSON new syntax --- nodejs-helloworld/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodejs-helloworld/package.json b/nodejs-helloworld/package.json index 29b13f406d..ed91722d3d 100644 --- a/nodejs-helloworld/package.json +++ b/nodejs-helloworld/package.json @@ -1,7 +1,7 @@ { "name": "nodejs-helloworld", "version": "1.0.0", - "description": "Hello World!", + "description": "Hello World! DO288 app testing", "main": "app.js", "scripts": { "start": "node app.js" From ebd5d9c2b27ff092696c6317f9585c302c5e8ac5 Mon Sep 17 00:00:00 2001 From: Student User Date: Wed, 7 Jun 2023 23:14:14 -0400 Subject: [PATCH 3/5] updated access file --- s2i-scripts/.s2i/bin/assemble | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/s2i-scripts/.s2i/bin/assemble b/s2i-scripts/.s2i/bin/assemble index 7e87289759..eb39808c20 100644 --- a/s2i-scripts/.s2i/bin/assemble +++ b/s2i-scripts/.s2i/bin/assemble @@ -13,10 +13,10 @@ config_s2i echo "---> Installing application source" cp -Rf /tmp/src/*.html ./ -DATE=`date "+%b %d, %Y @ %H:%M %p"` +DATE=`date "+%F @ %H:%M %p"` echo "---> Creating info page" -echo "Page built on $DATE" >> ./info.html +echo "This Page built on $DATE" >> ./info.html echo "Proudly served by Apache HTTP Server version $HTTPD_VERSION" >> ./info.html ######## CUSTOMIZATION ENDS HERE ############ From 5b09a88572a818ec58fe9b0207ba853c9975e79e Mon Sep 17 00:00:00 2001 From: Student User Date: Tue, 8 Aug 2023 08:23:14 -0400 Subject: [PATCH 4/5] ammended s2i --- s2i-scripts/.s2i/bin/assemble | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/s2i-scripts/.s2i/bin/assemble b/s2i-scripts/.s2i/bin/assemble index eb39808c20..602046b187 100644 --- a/s2i-scripts/.s2i/bin/assemble +++ b/s2i-scripts/.s2i/bin/assemble @@ -11,9 +11,13 @@ config_s2i ######## CUSTOMIZATION STARTS HERE ############ echo "---> Installing application source" + cp -Rf /tmp/src/*.html ./ +DATE=date "+%F" +echo $DATE >> ./info.html +echo "Astra inclinant, sed non obligant" >> ./info.html -DATE=`date "+%F @ %H:%M %p"` +#DATE=`date "+%F @ %H:%M %p"` echo "---> Creating info page" echo "This Page built on $DATE" >> ./info.html From 217fbe3a20d6755a148a68f123c723ceab70b1d2 Mon Sep 17 00:00:00 2001 From: Student User Date: Tue, 8 Aug 2023 10:13:55 -0400 Subject: [PATCH 5/5] updated --- container-build/Containerfile | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/container-build/Containerfile b/container-build/Containerfile index 30d07537b3..5e919368d7 100644 --- a/container-build/Containerfile +++ b/container-build/Containerfile @@ -1,2 +1,21 @@ -# Use the httpd-parent image as base +# Use the redhattraining/httpd-parent image as base FROM quay.io/redhattraining/httpd-parent + +# Change the port to 8080 +EXPOSE 8080 + +# Labels consumed by OpenShift +LABEL io.k8s.description="A basic Apache HTTP Server child image, uses ONBUILD" \ + io.k8s.display-name="Apache HTTP Server" \ + io.openshift.expose-services="8080:http" \ + io.openshift.tags="apache, httpd" + +# Change web server port to 8080 +RUN sed -i "s/Listen 80/Listen 8080/g" /etc/httpd/conf/httpd.conf + +# Permissions to allow container to run on OpenShift +RUN chgrp -R 0 /var/log/httpd /var/run/httpd && \ + chmod -R g=u /var/log/httpd /var/run/httpd + +# Run as a non-privileged user +USER 1001