From b4b652e9b0ae640e3c277fd0afe48333440d2984 Mon Sep 17 00:00:00 2001
From: Pavel Zilke <pavel.zilke@gmail.com>
Date: Wed, 25 Dec 2024 01:12:36 +0300
Subject: [PATCH] DEVOPS-1893 fix Dockerfiles

---
 config/Dockerfile    |  3 ++-
 config/Dockerfile.TC |  3 ++-
 config/entrypoint.sh | 48 --------------------------------------------
 3 files changed, 4 insertions(+), 50 deletions(-)
 delete mode 100644 config/entrypoint.sh

diff --git a/config/Dockerfile b/config/Dockerfile
index 137f4e4f..64f265bd 100644
--- a/config/Dockerfile
+++ b/config/Dockerfile
@@ -32,7 +32,8 @@ COPY config/tomcat /
 
 RUN cat /etc/tomcat/webbpm.properties >> /etc/tomcat/catalina.properties \
  && chown root:tomcat /var/lib/tomcat/webapps \
- && chmod g+rw /var/lib/tomcat/webapps
+ && chmod g+rw /var/lib/tomcat/webapps \
+ && rm -rf /var/lib/tomcat/webapps/ROOT
 
 USER tomcat
 
diff --git a/config/Dockerfile.TC b/config/Dockerfile.TC
index 7523f30c..e92d07d5 100644
--- a/config/Dockerfile.TC
+++ b/config/Dockerfile.TC
@@ -9,7 +9,8 @@ COPY tomcat /
 
 RUN cat /etc/tomcat/webbpm.properties >> /etc/tomcat/catalina.properties \
  && chown root:tomcat /var/lib/tomcat/webapps \
- && chmod g+rw /var/lib/tomcat/webapps
+ && chmod g+rw /var/lib/tomcat/webapps \
+ && rm -rf /var/lib/tomcat/webapps/ROOT
 
 COPY frontend.war /var/lib/tomcat/webapps/ROOT.war
 COPY account-applications.war /var/lib/tomcat/webapps/account-applications.war
diff --git a/config/entrypoint.sh b/config/entrypoint.sh
deleted file mode 100644
index 7178804e..00000000
--- a/config/entrypoint.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/bash
-set -e
-
-function wait_for_server() {
-  until `$JBOSS_HOME/bin/jboss-cli.sh -c ":read-attribute(name=server-state)" 2> /dev/null | grep -q running`; do
-    echo "Retry ..."
-  done
-}
-
-echo "dump environment variables to env.properties file"
-printenv > env.properties
-
-echo "starting JBoss"
-nohup $JBOSS_HOME/bin/standalone.sh --admin-only 1>&2  2>/dev/null &
-
-# running system patches
-wait_for_server
-$JBOSS_HOME/bin/jboss-cli.sh --connect --file="./patches/system/init.cli" --properties=env.properties
-$JBOSS_HOME/bin/jboss-cli.sh --connect --file="./patches/system/add-postgresql-driver.cli" --properties=env.properties
-bash "./patches/system/add-demo-user.sh"
-
-# running project patches
-find ./patches/ -type f -name '*.cli' -not -path './patches/system/*' -print0 |
-while IFS= read -r -d '' f; do
-    wait_for_server
-    echo "running $f"
-    $JBOSS_HOME/bin/jboss-cli.sh --connect --file="$f" --properties=env.properties
-done;
-
-find ./patches/ -type f -name '*.sh' -not -path './patches/system/*' -print0 |
-while IFS= read -r -d '' f; do
-    wait_for_server
-    echo "running $f"
-    bash "$f"
-done
-
-echo "stopping JBoss"
-wait_for_server
-$JBOSS_HOME/bin/jboss-cli.sh --connect --command=:shutdown
-
-if ! [[ -z $SERVER_START ]]; then
-    echo "starting JBoss in standalone"
-    sleep 10 # without this occurs error "address already in use"
-    /opt/jboss/wildfly/bin/standalone.sh -c  standalone.xml -b 0.0.0.0 -bmanagement 0.0.0.0
-else
-    echo "cleaning up JBoss logs"
-    rm -rf $JBOSS_HOME/standalone/log
-fi