diff --git a/CHANGELOG.md b/CHANGELOG.md index c1066a5..cda5c7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for Smartgears Distribution +## [v3.2.0] + +- clean-container script uses proxy + ## [v3.1.0] - Upgraded gcube-smartgears-bom to version 2.1.0 diff --git a/distro/contents/scripts/clean-container-state b/distro/contents/scripts/clean-container-state index da6d4ec..0cbe087 100644 --- a/distro/contents/scripts/clean-container-state +++ b/distro/contents/scripts/clean-container-state @@ -1,4 +1,5 @@ #!/bin/bash +[ -f /etc/profile.d/10-java-caching-proxy.sh ] && . /etc/profile.d/10-java-caching-proxy.sh function showhelp { echo -e "\nusage: clean-container-state [-g ] [-s ] [-h] \n" @@ -43,10 +44,10 @@ source "$ghnhome"/scripts/load-env "$ghnhome" RETVAL= if [ -z "$filename" ]; then - java org.gcube.smartgears.utils.sweeper.ContainerSweeperClient -G"$ghnhome" 1>/home/gcube/SmartGears/containerState.log + java $JAVA_OPTS org.gcube.smartgears.utils.sweeper.ContainerSweeperClient -G"$ghnhome" 1>/home/gcube/SmartGears/containerState.log RETVAL=$? else - java org.gcube.smartgears.utils.sweeper.ContainerSweeperClient $filename -G"$ghnhome" 1>/home/gcube/SmartGears/containerState.log + java $JAVA_OPTS org.gcube.smartgears.utils.sweeper.ContainerSweeperClient $filename -G"$ghnhome" 1>/home/gcube/SmartGears/containerState.log RETVAL=$? if [ $RETVAL -eq 0 ] ; then echo -e "\nvolatile state saved in $ghnhome/$filename" diff --git a/pom.xml b/pom.xml index b0494e9..99506af 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.gcube.distribution smartgears-distribution - 3.1.0 + 3.2.0 pom A distribution for the SmartGears Framework