From 6e6b1ad492d7b4013fca8f134281648911f97054 Mon Sep 17 00:00:00 2001 From: Student User Date: Mon, 28 Jun 2021 17:35:08 -0400 Subject: [PATCH 1/7] Updates assemble script --- s2i-scripts/.s2i/bin/assemble | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/s2i-scripts/.s2i/bin/assemble b/s2i-scripts/.s2i/bin/assemble index 7e87289759..bd148b875f 100644 --- a/s2i-scripts/.s2i/bin/assemble +++ b/s2i-scripts/.s2i/bin/assemble @@ -11,13 +11,15 @@ config_s2i ######## CUSTOMIZATION STARTS HERE ############ echo "---> Installing application source" + cp -Rf /tmp/src/*.html ./ -DATE=`date "+%b %d, %Y @ %H:%M %p"` +Date = $(date "+%Y-%m-%d") +#DATE=`date "+%b %d, %Y @ %H:%M %p"` echo "---> Creating info page" -echo "Page built on $DATE" >> ./info.html -echo "Proudly served by Apache HTTP Server version $HTTPD_VERSION" >> ./info.html +echo "Page built on $Date" >> ./info.html +echo "by Janey Alam" >> ./info.html ######## CUSTOMIZATION ENDS HERE ############ From e04eb76b0ccdf5fe41323435eb215586a73f5f80 Mon Sep 17 00:00:00 2001 From: Student User Date: Mon, 28 Jun 2021 18:05:49 -0400 Subject: [PATCH 2/7] Updated Assemble file --- s2i-scripts/.s2i/bin/assemble | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/s2i-scripts/.s2i/bin/assemble b/s2i-scripts/.s2i/bin/assemble index bd148b875f..7e87289759 100644 --- a/s2i-scripts/.s2i/bin/assemble +++ b/s2i-scripts/.s2i/bin/assemble @@ -11,15 +11,13 @@ config_s2i ######## CUSTOMIZATION STARTS HERE ############ echo "---> Installing application source" - cp -Rf /tmp/src/*.html ./ -Date = $(date "+%Y-%m-%d") -#DATE=`date "+%b %d, %Y @ %H:%M %p"` +DATE=`date "+%b %d, %Y @ %H:%M %p"` echo "---> Creating info page" -echo "Page built on $Date" >> ./info.html -echo "by Janey Alam" >> ./info.html +echo "Page built on $DATE" >> ./info.html +echo "Proudly served by Apache HTTP Server version $HTTPD_VERSION" >> ./info.html ######## CUSTOMIZATION ENDS HERE ############ From b1701f8643be92beaa08a85f5a8bebc53637cc1e Mon Sep 17 00:00:00 2001 From: Student User Date: Mon, 28 Jun 2021 18:24:43 -0400 Subject: [PATCH 3/7] Updated assemble scrupt --- s2i-scripts/.s2i/bin/assemble | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/s2i-scripts/.s2i/bin/assemble b/s2i-scripts/.s2i/bin/assemble index 7e87289759..4a09815089 100644 --- a/s2i-scripts/.s2i/bin/assemble +++ b/s2i-scripts/.s2i/bin/assemble @@ -13,11 +13,12 @@ config_s2i echo "---> Installing application source" cp -Rf /tmp/src/*.html ./ -DATE=`date "+%b %d, %Y @ %H:%M %p"` +DATE = $(date+%F) + ###### DATE=`date "+%b %d, %Y @ %H:%M %p"` echo "---> Creating info page" -echo "Page built on $DATE" >> ./info.html -echo "Proudly served by Apache HTTP Server version $HTTPD_VERSION" >> ./info.html +echo "Page built on ${DATE}" > ./info.html +echo "by Janey Alam" >> ./info.html ######## CUSTOMIZATION ENDS HERE ############ From b63abab8a50bf5f1b09c999158ba8b5b29477712 Mon Sep 17 00:00:00 2001 From: janeyalam <55035982+janeyalam@users.noreply.github.com> Date: Tue, 29 Jun 2021 12:14:58 -0400 Subject: [PATCH 4/7] Update assemble --- s2i-scripts/.s2i/bin/assemble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s2i-scripts/.s2i/bin/assemble b/s2i-scripts/.s2i/bin/assemble index 4a09815089..cd7e287455 100644 --- a/s2i-scripts/.s2i/bin/assemble +++ b/s2i-scripts/.s2i/bin/assemble @@ -13,7 +13,7 @@ config_s2i echo "---> Installing application source" cp -Rf /tmp/src/*.html ./ -DATE = $(date+%F) +DATE=$(date+%F) ###### DATE=`date "+%b %d, %Y @ %H:%M %p"` echo "---> Creating info page" From 504c939ee714f16f36b19f1d7749ef6d03352608 Mon Sep 17 00:00:00 2001 From: janeyalam <55035982+janeyalam@users.noreply.github.com> Date: Tue, 29 Jun 2021 12:16:21 -0400 Subject: [PATCH 5/7] Update assemble --- s2i-scripts/.s2i/bin/assemble | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/s2i-scripts/.s2i/bin/assemble b/s2i-scripts/.s2i/bin/assemble index cd7e287455..9fabbcd38b 100644 --- a/s2i-scripts/.s2i/bin/assemble +++ b/s2i-scripts/.s2i/bin/assemble @@ -13,8 +13,7 @@ config_s2i echo "---> Installing application source" cp -Rf /tmp/src/*.html ./ -DATE=$(date+%F) - ###### DATE=`date "+%b %d, %Y @ %H:%M %p"` +DATE=`date "+%b %d, %Y @ %H:%M %p"` echo "---> Creating info page" echo "Page built on ${DATE}" > ./info.html From d9b1942cf800fedebd545635c3e0be04fe7a3a11 Mon Sep 17 00:00:00 2001 From: janeyalam <55035982+janeyalam@users.noreply.github.com> Date: Tue, 29 Jun 2021 12:23:34 -0400 Subject: [PATCH 6/7] Update assemble --- s2i-scripts/.s2i/bin/assemble | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/s2i-scripts/.s2i/bin/assemble b/s2i-scripts/.s2i/bin/assemble index 9fabbcd38b..7b700de2b5 100644 --- a/s2i-scripts/.s2i/bin/assemble +++ b/s2i-scripts/.s2i/bin/assemble @@ -13,8 +13,7 @@ config_s2i echo "---> Installing application source" cp -Rf /tmp/src/*.html ./ -DATE=`date "+%b %d, %Y @ %H:%M %p"` - +DATE=$(date +%F) echo "---> Creating info page" echo "Page built on ${DATE}" > ./info.html echo "by Janey Alam" >> ./info.html From 4085071c110e4afbfeab62b544ee66db5e5e0cd9 Mon Sep 17 00:00:00 2001 From: janeyalam <55035982+janeyalam@users.noreply.github.com> Date: Fri, 26 Jul 2024 17:23:55 -0400 Subject: [PATCH 7/7] Update package.json --- 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..3abcc1eeca 100644 --- a/nodejs-helloworld/package.json +++ b/nodejs-helloworld/package.json @@ -7,7 +7,7 @@ "start": "node app.js" }, "author": "Red Hat Training", - "license": "ASL", + "license": "ASL" "dependencies": { "express" "4.14.x" }