Skip to content
Snippets Groups Projects
Commit 7ef0aafe authored by Mateusz Żebrak's avatar Mateusz Żebrak
Browse files

Allow --clive-version to be omitted in build_instance.sh when --embedded-testnet is used

parent 99ddaa72
No related branches found
No related tags found
Loading
...@@ -28,7 +28,7 @@ print_help () { ...@@ -28,7 +28,7 @@ print_help () {
echo "OPTIONS:" echo "OPTIONS:"
echo " --beekeeper-source-image=image_name Allows to specify image name containing a prebuilt beekeper tool" echo " --beekeeper-source-image=image_name Allows to specify image name containing a prebuilt beekeper tool"
echo " --base-image=image_name Allows to specify an image name being use as a base of the one to be built" echo " --base-image=image_name Allows to specify an image name being use as a base of the one to be built"
echo " --clive-version=version Allows to specify a version of clive to be installed in the image" echo " --clive-version=version Allows to specify a version of clive to be installed in the image (omitted if --embedded-testnet is used)"
echo " --embedded-testnet Allows to build a clive image having embedded a hived testnet inside (ready for immediate sanboxing run)" echo " --embedded-testnet Allows to build a clive image having embedded a hived testnet inside (ready for immediate sanboxing run)"
echo " --image-path-suffix Allows to specify a suffix to be added to the image path, to organize images in a more structured directory-like way" echo " --image-path-suffix Allows to specify a suffix to be added to the image path, to organize images in a more structured directory-like way"
echo " --help Display this help screen and exit" echo " --help Display this help screen and exit"
...@@ -86,7 +86,14 @@ TST_REGISTRY=${REGISTRY:?"Missing arg #3 to specify target container registry"} ...@@ -86,7 +86,14 @@ TST_REGISTRY=${REGISTRY:?"Missing arg #3 to specify target container registry"}
TST_BEEKEEPER_IMAGE=${BEEKEEPER_IMAGE:?"Missing --beekeeper-source-image to specify beekeeper binary source"} TST_BEEKEEPER_IMAGE=${BEEKEEPER_IMAGE:?"Missing --beekeeper-source-image to specify beekeeper binary source"}
TST_BASE_IMAGE=${BASE_IMAGE:?"Missing --base-image option to specify base image"} TST_BASE_IMAGE=${BASE_IMAGE:?"Missing --base-image option to specify base image"}
TST_CLIVE_VERSION=${CLIVE_VERSION:?"Missing --clive-version option to specify clive version"}
if [ -z "$CLIVE_VERSION" ] && [ "$DOCKER_TARGET" != "embedded_testnet_instance" ];
then
echo "ERROR: Missing --clive-version option to specify clive version to be installed"
echo
print_help
exit 2
fi
# Supplement a registry path by trailing slash (if needed) # Supplement a registry path by trailing slash (if needed)
[[ "${REGISTRY}" != */ ]] && REGISTRY="${REGISTRY}/" [[ "${REGISTRY}" != */ ]] && REGISTRY="${REGISTRY}/"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment