Skip to content

chore: remove workarounds previously implemented #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nathanklick merged 2 commits into from
Aug 4, 2023
Merged

chore: remove workarounds previously implemented #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b9823d
chore: remove workarounds previously implemented
nathanklick Aug 3, 2023
ed95586
Merge branch 'main' into 00243-Remove-Workaround
nathanklick Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions dev/scripts/direct-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
18 changes: 0 additions & 18 deletions dev/scripts/helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,21 +773,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}"
}
3 changes: 0 additions & 3 deletions docker/ubi8-init-java17/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions docker/ubi8-init-java17/network-node.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down