Skip to content

Commit 6870f21

Browse files
authored
Merge pull request #473 from bharathappali/fix-scc-arm-crash
Use kill instead of shutdown script to avoid tomcat startup issue
2 parents fea52f2 + 2402470 commit 6870f21

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

dockerfile_functions.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ EOI
733733
cat >> "$1" <<'EOI'
734734
unset OPENJ9_JAVA_OPTIONS; \
735735
SCC_SIZE="50m"; \
736-
SCC_GEN_RUNS_COUNT=3; \
736+
SCC_GEN_RUNS_COUNT=2; \
737737
DOWNLOAD_PATH_TOMCAT=/tmp/tomcat; \
738738
INSTALL_PATH_TOMCAT=/opt/tomcat-home; \
739739
TOMCAT_CHECKSUM="0db27185d9fc3174f2c670f814df3dda8a008b89d1a38a5d96cbbe119767ebfb1cf0bce956b27954aee9be19c4a7b91f2579d967932207976322033a86075f98"; \
@@ -751,7 +751,7 @@ EOI
751751
do \
752752
"${INSTALL_PATH_TOMCAT}"/bin/startup.sh; \
753753
sleep 5; \
754-
"${INSTALL_PATH_TOMCAT}"/bin/shutdown.sh; \
754+
kill -9 $(ps -ef | grep 'catalina' | tr -s ' ' | cut -d ' ' -f 2 | head -n 2 | tail -n 1); \
755755
sleep 5; \
756756
done; \
757757
\
@@ -769,7 +769,7 @@ EOI
769769
do \
770770
"${INSTALL_PATH_TOMCAT}"/bin/startup.sh; \
771771
sleep 5; \
772-
"${INSTALL_PATH_TOMCAT}"/bin/shutdown.sh; \
772+
kill -9 $(ps -ef | grep 'catalina' | tr -s ' ' | cut -d ' ' -f 2 | head -n 2 | tail -n 1); \
773773
sleep 5; \
774774
done; \
775775
\

0 commit comments

Comments
 (0)