From 7b9823dad19831110549d312654b900aefdc355a Mon Sep 17 00:00:00 2001
From: Nathan Klick <nathan@swirldslabs.com>
Date: Thu, 3 Aug 2023 17:10:51 -0500
Subject: [PATCH] chore: remove workarounds previously implemented

Signed-off-by: Nathan Klick <nathan@swirldslabs.com>
---
 dev/scripts/direct-install.sh                |  2 --
 dev/scripts/helper.sh                        | 18 ------------------
 docker/ubi8-init-java17/Dockerfile           |  3 ---
 docker/ubi8-init-java17/network-node.service |  3 +--
 4 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/dev/scripts/direct-install.sh b/dev/scripts/direct-install.sh
index 575b30bcb..c31f7f2d1 100644
--- a/dev/scripts/direct-install.sh
+++ b/dev/scripts/direct-install.sh
@@ -68,8 +68,6 @@ function setup_node_all() {
     ls_path "${pod}" "${HAPI_PATH}/data/keys/"
     set_permission "${pod}" "${HAPI_PATH}"
 
-    # TODO remove set_application_env after 0.5.0 docker image is published
-    set_application_env "${pod}"
     unzip_build "${pod}"
   done
 }
diff --git a/dev/scripts/helper.sh b/dev/scripts/helper.sh
index 5bb421198..03fb6577b 100755
--- a/dev/scripts/helper.sh
+++ b/dev/scripts/helper.sh
@@ -735,21 +735,3 @@ function reset_node_all() {
 
   return "${EX_OK}"
 }
-
-# TODO remove set_application_env after 0.5.0 docker image is published
-function set_application_env() {
-   local pod="${1}"
-
-    echo ""
-    echo "Populating values in /etc/network-node/application.env ${pod}"
-    echo "-----------------------------------------------------------------------------------------------------"
-
-    if [ -z "${pod}" ]; then
-      echo "ERROR: 'reset_nmt' - pod name is required"
-      return "${EX_ERR}"
-    fi
-
-    # best effort clean up of docker env
-    "${KCTL}" exec "${pod}" -c root-container -- bash -c "echo APP_HOME=/opt/hgcapp/services-hedera/HapiApp2.0 > /etc/network-node/application.env" || true
-    return "${EX_OK}"
-}
diff --git a/docker/ubi8-init-java17/Dockerfile b/docker/ubi8-init-java17/Dockerfile
index a0023d148..436a71ffd 100644
--- a/docker/ubi8-init-java17/Dockerfile
+++ b/docker/ubi8-init-java17/Dockerfile
@@ -107,9 +107,6 @@ RUN chmod -R +x /etc/network-node/entrypoint.sh && \
 
 RUN mkdir -p /etc/network-node && \
     touch /etc/network-node/application.env && \
-    echo "APP_HOME=/opt/hgcapp/services-hedera/HapiApp2.0" >> /etc/network-node/application.env && \
-    echo "JAVA_HOME=\"${JAVA_HOME}\"" >> /etc/network-node/java.env && \
-    echo "PATH=\"${PATH}\"" >> /etc/network-node/java.env && \
     chown -R 2000:2000 /etc/network-node
 
 # Expose TCP/UDP Port Definitions
diff --git a/docker/ubi8-init-java17/network-node.service b/docker/ubi8-init-java17/network-node.service
index 8d6a46eb2..634d70aa9 100644
--- a/docker/ubi8-init-java17/network-node.service
+++ b/docker/ubi8-init-java17/network-node.service
@@ -8,8 +8,7 @@ Restart=no
 User=hedera
 Group=hedera
 
-PassEnvironment=JAVA_HOME PATH APP_HOME
-EnvironmentFile=/etc/network-node/java.env
+PassEnvironment=JAVA_HOME JAVA_OPTS JAVA_HEAP_MIN JAVA_HEAP_MAX PATH APP_HOME
 EnvironmentFile=/etc/network-node/application.env
 
 WorkingDirectory=/opt/hgcapp/services-hedera/HapiApp2.0