Feature/us 613858 - Minor fixes to support web-ready on the preferred…

… OS. (#212)

* US-613858 - Making minor fixes to support building we-ready images custom OS

Co-authored-by: kumas39 <saurabh.kumar2@in.pega.com>

Dockerfile

@@ -3,7 +3,7 @@
 # Base image to extend from
 
 ARG BASE_TOMCAT_IMAGE
-FROM pegasystems/$BASE_TOMCAT_IMAGE as release
+FROM $BASE_TOMCAT_IMAGE as release
 
 ARG VERSION
 

Makefile

@@ -8,13 +8,13 @@ all: image
 container: image
 
 image:
-	docker build --build-arg VERSION=$(VERSION) --build-arg BASE_TOMCAT_IMAGE=tomcat:9-jdk17 -t $(IMAGE_NAME) . # Build image and automatically tag it as latest on jdk17
-	docker build --build-arg VERSION=$(VERSION) --build-arg BASE_TOMCAT_IMAGE=tomcat:9-jdk11 -t $(IMAGE_NAME):3-jdk11 . # Build image using tomcat 9 , jdk 11
-	docker build --build-arg VERSION=$(VERSION) --build-arg BASE_TOMCAT_IMAGE=tomcat:9-jdk17 -t $(IMAGE_NAME):3-jdk17 . # Build image using tomcat 9 , jdk 17
+	docker build --build-arg VERSION=$(VERSION) --build-arg BASE_TOMCAT_IMAGE=pegasystems/tomcat:9-jdk17 -t $(IMAGE_NAME) . # Build image and automatically tag it as latest on jdk17
+	docker build --build-arg VERSION=$(VERSION) --build-arg BASE_TOMCAT_IMAGE=pegasystems/tomcat:9-jdk11 -t $(IMAGE_NAME):3-jdk11 . # Build image using tomcat 9 , jdk 11
+	docker build --build-arg VERSION=$(VERSION) --build-arg BASE_TOMCAT_IMAGE=pegasystems/tomcat:9-jdk17 -t $(IMAGE_NAME):3-jdk17 . # Build image using tomcat 9 , jdk 17
 
 test: image
 	# Build image for executing test cases against it
-	docker build --build-arg VERSION=$(VERSION) --build-arg BASE_TOMCAT_IMAGE=tomcat:9-jdk11 -t qualitytest . --target qualitytest
+	docker build --build-arg VERSION=$(VERSION) --build-arg BASE_TOMCAT_IMAGE=pegasystems/tomcat:9-jdk11 -t qualitytest . --target qualitytest
 	# Execute test cases
 	container-structure-test test --image qualitytest --config tests/pega-web-ready-testcases.yaml
 	container-structure-test test --image $(IMAGE_NAME) --config tests/pega-web-ready-release-testcases.yaml

tomcat-bin/setenv.sh

@@ -8,7 +8,7 @@ JAVA_OPTS="${JAVA_OPTS} -Djava.awt.headless=true"
 #
 # Append security overwrites
 #
-JAVA_OPTS="${JAVA_OPTS} -Djava.security.properties=/usr/local/tomcat/conf/java.security.overwrite"
+JAVA_OPTS="${JAVA_OPTS} -Djava.security.properties=${CATALINA_HOME}/conf/java.security.overwrite"
 
 #
 # Pass Node tier to Pega
@@ -81,7 +81,7 @@ CATALINA_OPTS="${CATALINA_OPTS} -XX:+DisableExplicitGC"
 CATALINA_OPTS="${CATALINA_OPTS} -Djava.security.egd=file:///dev/urandom"
 # recommended overridable JVM Arguments 
 CATALINA_OPTS="-XX:+UseStringDeduplication ${CATALINA_OPTS}"
-CATALINA_OPTS="-Xlog:gc*,gc+heap=debug,gc+humongous=debug:file=/usr/local/tomcat/logs/gc.log:uptime,pid,level,time,tags:filecount=3,filesize=2M ${CATALINA_OPTS}"
+CATALINA_OPTS="-Xlog:gc*,gc+heap=debug,gc+humongous=debug:file=${CATALINA_HOME}/logs/gc.log:uptime,pid,level,time,tags:filecount=3,filesize=2M ${CATALINA_OPTS}"
 
 echo "CATALINA_OPTS: \"${CATALINA_OPTS}\""