edited variable.makefile and adapt_utilities_sql.sh to use the environment variable for dspace

user

dockerfiles/adapt_utilities_sql.sh

@@ -4,4 +4,5 @@ git clone https://github.com/commul/clarin-dspace.git -b commul-custom /tmp/dspa
 cp /tmp/dspace/utilities/utilities.sql /tmp/sql/
 cp /tmp/dspace/utilities/license_definition.txt /tmp/sql/
 perl -pi -e "s#afile :utildir '/license_definition.txt'#afile '/tmp/sql/license_definition.txt'#;" /tmp/sql/utilities.sql
+perl -pi -e 's/\$\{DSPACE_USER\}/$ENV{DSPACE_USER}/;' /tmp/sql/utilities.sql
 rm -rf /tmp/dspace

dockerfiles/commul-customization/variable.makefile

@@ -16,7 +16,7 @@ TOMCAT_GROUP:=tomcat$(TOMCAT_VERSION)
 TOMCAT_CONF:=/etc/$(TOMCAT_USER)
 
 # dspace
-DSPACE_USER:=dspace
+DSPACE_USER:=${DSPACE_USER}
 
 # tool directories
 DIRECTORY_POSTGRESQL:=/var/lib/postgresql