some adaptions to Dockerfiles to streamline build process

Dockerfile.dspace.dist

@@ -84,11 +84,9 @@ COPY commul-customization/local.properties /opt/repository/workspace/sources/
 COPY commul-customization/tomcat-server.xml /opt/tomcat8/conf/server.xml
 RUN chmod u+x /opt/repository/workspace/scripts/*_stack.sh
 
-# install libs and make deploy
+# install libs
 WORKDIR /opt/repository/workspace/scripts
 RUN make install_libs
-# this uses the database
-RUN make new_deploy
 
 # convenience apps for debug purposes (vim and jsbeautifier)
 RUN apt-get -y install vim
@@ -118,9 +116,12 @@ COPY commul-customization/nginx.conf /opt/nginx/conf/
 COPY commul-customization/repository_auth /opt/nginx/conf/
 COPY commul-customization/shibboleth2.xml /opt/shibboleth-sp-fastcgi/etc/shibboleth/
 COPY commul-customization/shib_clear_headers /opt/nginx/conf/
-COPY commul-customization/aai_config.js /opt/lindat-dspace/installation/webapps/xmlui/themes/UFAL/lib/js/
+COPY commul-customization/aai_config.js /tmp/
 COPY commul-customization/aai.js /opt/repository/sources/lindat-aai-discovery/
 WORKDIR /opt/repository/sources/lindat-aai-discovery/
+# this line only is necessary until https://github.com/ufal/lindat-aai-discovery/issues/6 is resolved
+RUN perl -pi -e 's/http/https/' /opt/repository/sources/lindat-aai-discovery/Makefile
+RUN touch /opt/repository/sources/lindat-aai-discovery/aai.js
 RUN make aai.min.js
 
 # copy certificate for lindat-dev
@@ -145,14 +146,11 @@ ENTRYPOINT ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf"]
 #
 #  and do these things by hand
 # 
-# start background programs
-# supervisord -c /etc/supervisord.conf
-# /etc/init.d/postgresql start
-#
-# create dspace admin as tomcat8, so that the log files have the right owner
+# make new_deploy
+## create dspace admin as tomcat8, so that the log files have the right owner
 # su  -s /bin/sh tomcat8
 # /opt/lindat-dspace/installation/bin/dspace create-administrator
-# (interactive)
+## (interactive)
 
 # start the server
 # cd /opt/repository/sources/dspace/utilities/project_helpers/scripts

Dockerfile.sql.dist

@@ -5,7 +5,7 @@ LABEL maintainer="Alexander König <Alexander.Koenig@eurac.edu>"
 RUN mkdir -p /docker-entrypoint-initdb.d
 COPY commul-customization/init-dspace-dbs.sh /docker-entrypoint-initdb.d/
 
-# copy utilities.sql
+# copy utilities generating script
 RUN mkdir /tmp/sql/
-COPY commul-customization/utilities.sql /tmp/sql/
-COPY commul-customization/license_definition.txt /tmp/sql/
+COPY adapt_utilities_sql.sh /tmp/sql/
+RUN /tmp/sql/adapt_utilities_sql.sh

adapt_utilities_sql.sh

 #!/bin/bash
 
 git clone https://github.com/commul/clarin-dspace.git -b clarin /tmp/dspace
-cp /tmp/dspace/utilities/utilities.sql ./commul-customization/
-cp /tmp/dspace/utilities/license_definition.txt ./commul-customization/
-perl -pi -e "s#afile :utildir '/license_definition.txt'#afile '/tmp/sql/license_definition.txt'#;" ./commul-customization/utilities.sql
+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
 rm -rf /tmp/dspace

commul-customization/aai_config.js

-"use strict";jQuery(document).ready(function(){var a=(function(){var b={};b.port=(window.location.port===""?"":":"+window.location.port);b.host=window.location.protocol+"//"+window.location.hostname;b.repoPath=jQuery("a#repository_path").attr("href");if(b.repoPath.charAt(b.repoPath.length-1)!=="/"){b.repoPath=b.repoPath+"/"}b.target=b.host+b.port+b.repoPath;b.responseUrl=(window.location.hostname.search("lindat-dev.eurac.edu")>=0)?"":b.host+b.port+b.repoPath+"themes/UFAL/lib/html/disco-juice.html?";b.metadataFeed=b.target+"discojuice/feeds";b.serviceName="Eurac CLARIN Center";b.localauth='<form method="post" action="'+b.target+'password-login"> <p>Sign in using your local account obtained from the Eurac CLARIN Center administrator.</p><p style="margin: 5px; color: #888" ><input type="text" name="login_email" style="font-size: 160%; width: 100%" id="login" /> <label for="login">E-Mail Address</label></p><p style="margin: 5px; color: #888" ><input type="password" name="login_password" style="font-size: 160%; width: 100%" id="pass" /> <label for="pass">Password</label></p><p style="margin: 5px; color: #607890; text-decoration: underline;"><a href="'+b.target+'forgot">Forgot your password?</a></p><p  style="" ><input type="submit" style="margin: 20px 2px" name="submit" value="Sign in" /></p></form>';b.target=b.target+"shibboleth-login";return b})();if(!("aai" in window)){throw"Failed to find UFAL AAI object. See https://redmine.ms.mff.cuni.cz/projects/lindat-aai for more details!"}window.aai.setup(a)});
+"use strict";jQuery(document).ready(function(){var a=(function(){var b={};b.port=(window.location.port===""?"":":"+window.location.port);b.host=window.location.protocol+"//"+window.location.hostname;b.repoPath=jQuery("a#repository_path").attr("href");if(b.repoPath.charAt(b.repoPath.length-1)!=="/"){b.repoPath=b.repoPath+"/"}b.target=b.host+b.port+b.repoPath;b.responseUrl=(window.location.hostname.search("lindat-dev.eurac.edu")>=0)?"":b.host+b.port+b.repoPath+"themes/COMMUL/lib/html/disco-juice.html?";b.metadataFeed=b.target+"discojuice/feeds";b.serviceName="Eurac Research CLARIN Center";b.localauth='<form method="post" action="'+b.target+'password-login"> <p>Sign in using your local account obtained from the Eurac Research CLARIN Center administrator.</p><p style="margin: 5px; color: #888" ><input type="text" name="login_email" style="font-size: 160%; width: 100%" id="login" /> <label for="login">E-Mail Address</label></p><p style="margin: 5px; color: #888" ><input type="password" name="login_password" style="font-size: 160%; width: 100%" id="pass" /> <label for="pass">Password</label></p><p style="margin: 5px; color: #607890; text-decoration: underline;"><a href="'+b.target+'forgot">Forgot your password?</a></p><p  style="" ><input type="submit" style="margin: 20px 2px" name="submit" value="Sign in" /></p></form>';b.target=b.target+"shibboleth-login";return b})();if(!("aai" in window)){throw"Failed to find UFAL AAI object. See https://redmine.ms.mff.cuni.cz/projects/lindat-aai for more details!"}window.aai.setup(a)});