ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-21 09:51:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-2888 Allow bring-your-own-config to docker image (#5095)

Browse Source 
* CORDA-2888 Allow bring-your-own-config to docker image (#2035)

modify run logic so that if node config is present, do not generate a new one

* Change according to PR review.

* Removed whitespace from generate-config in the argument list.

* Changed state of initial registration part of the script to pre cherry-pick to preserve changes that arent into enterprise.
This commit is contained in:
Stefan Iliev 2019-05-03 13:25:22 +01:00 committed by Anthony Keenan
parent 25f335861b
commit 69ea5158ed
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docker/src/bash/generate-config.sh
View File

@ -25,11 +25,8 @@ function generateTestnetConfig() {
}
function generateGenericCZConfig(){
if [[ -f /etc/corda/node.conf ]] ; then
echo 'WARN: existing config detected, launching corda'
run-corda
else
if ! [[ -f ${CONFIG_FOLDER}/node.conf ]] ; then
echo 'INFO: no existing node config detected, generating config skeleton'
: ${NETWORKMAP_URL:? '$NETWORKMAP_URL, the Compatibility Zone to join must be set as environment variable'}
: ${DOORMAN_URL:? '$DOORMAN_URL, the Doorman to use when joining must be set as environment variable'}
: ${MY_LEGAL_NAME:? '$MY_LEGAL_NAME, the X500 name to use when joining must be set as environment variable'}
@ -47,16 +44,15 @@ function generateGenericCZConfig(){
MY_RPC_PORT=${MY_RPC_PORT} \
MY_RPC_ADMIN_PORT=${MY_RPC_ADMIN_PORT} \
java -jar config-exporter.jar "GENERIC-CZ" "/opt/corda/starting-node.conf" "${CONFIG_FOLDER}/node.conf"
fi
java -Djava.security.egd=file:/dev/./urandom -Dcapsule.jvm.args="${JVM_ARGS}" -jar /opt/corda/bin/corda.jar \
--initial-registration \
--base-directory /opt/corda \
--config-file ${CONFIG_FOLDER}/node.conf \
--network-root-truststore-password ${NETWORK_TRUST_PASSWORD} \
--network-root-truststore ${CERTIFICATES_FOLDER}/${TRUST_STORE_NAME} &&\
echo "Succesfully registered with ${DOORMAN_URL}, starting corda" && \
--network-root-truststore ${CERTIFICATES_FOLDER}/${TRUST_STORE_NAME} && \
echo "Successfully registered with ${DOORMAN_URL}, starting corda" && \
run-corda
fi
}
function downloadTestnetCerts() {
@ -109,7 +105,6 @@ while :; do
shift
done
: ${TRUST_STORE_NAME="network-root-truststore.jks"}
: ${JVM_ARGS='-Xmx4g -Xms2g -XX:+UseG1GC'}