Skip to content

Commit 2e07219

Browse files
authored
chore: remove workarounds previously implemented (#245)
Signed-off-by: Nathan Klick <nathan@swirldslabs.com>
1 parent 3639610 commit 2e07219

4 files changed

Lines changed: 1 addition & 25 deletions

File tree

dev/scripts/direct-install.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ function setup_node_all() {
6868
ls_path "${pod}" "${HAPI_PATH}/data/keys/"
6969
set_permission "${pod}" "${HAPI_PATH}"
7070

71-
# TODO remove set_application_env after 0.5.0 docker image is published
72-
set_application_env "${pod}"
7371
unzip_build "${pod}"
7472
done
7573
}

dev/scripts/helper.sh

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -773,21 +773,3 @@ function reset_node_all() {
773773

774774
return "${EX_OK}"
775775
}
776-
777-
# TODO remove set_application_env after 0.5.0 docker image is published
778-
function set_application_env() {
779-
local pod="${1}"
780-
781-
echo ""
782-
echo "Populating values in /etc/network-node/application.env ${pod}"
783-
echo "-----------------------------------------------------------------------------------------------------"
784-
785-
if [ -z "${pod}" ]; then
786-
echo "ERROR: 'reset_nmt' - pod name is required"
787-
return "${EX_ERR}"
788-
fi
789-
790-
# best effort clean up of docker env
791-
"${KCTL}" exec "${pod}" -c root-container -- bash -c "echo APP_HOME=/opt/hgcapp/services-hedera/HapiApp2.0 > /etc/network-node/application.env" || true
792-
return "${EX_OK}"
793-
}

docker/ubi8-init-java17/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@ RUN chmod -R +x /etc/network-node/entrypoint.sh && \
107107

108108
RUN mkdir -p /etc/network-node && \
109109
touch /etc/network-node/application.env && \
110-
echo "APP_HOME=/opt/hgcapp/services-hedera/HapiApp2.0" >> /etc/network-node/application.env && \
111-
echo "JAVA_HOME=\"${JAVA_HOME}\"" >> /etc/network-node/java.env && \
112-
echo "PATH=\"${PATH}\"" >> /etc/network-node/java.env && \
113110
chown -R 2000:2000 /etc/network-node
114111

115112
# Expose TCP/UDP Port Definitions

docker/ubi8-init-java17/network-node.service

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ Restart=no
88
User=hedera
99
Group=hedera
1010

11-
PassEnvironment=JAVA_HOME PATH APP_HOME
12-
EnvironmentFile=/etc/network-node/java.env
11+
PassEnvironment=JAVA_HOME JAVA_OPTS JAVA_HEAP_MIN JAVA_HEAP_MAX PATH APP_HOME
1312
EnvironmentFile=/etc/network-node/application.env
1413

1514
WorkingDirectory=/opt/hgcapp/services-hedera/HapiApp2.0

0 commit comments

Comments
 (0)