moved aai project from dspace to nginx image

Dockerfile.dspace

@@ -49,9 +49,6 @@ COPY commul-customization/catalina.sh /opt/tomcat8/bin/
 COPY commul-customization/setenv.sh /opt/tomcat8/bin/
 COPY commul-customization/tomcat-server.xml /opt/tomcat8/conf/server.xml
 
-# get aai project
-RUN apt-get install -y git
-RUN git clone https://github.com/ufal/lindat-aai-discovery.git /opt/repository/sources/lindat-aai-discovery
 
 # install Dspace
 RUN git clone https://github.com/commul/clarin-dspace.git -b clarin /opt/repository/sources/dspace
@@ -71,15 +68,6 @@ RUN make install_libs
 
 # copy over config files
 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
-
-# convenience setting of workdir
-WORKDIR /opt/repository/workspace/scripts
 
 CMD tail -f /opt/repository/sources/dspace/dspace-api/src/test/data/dspaceFolder/log/dspace.log
 

Dockerfile.nginx

@@ -15,7 +15,7 @@ RUN cpanm File::Spec::Functions
 RUN cpanm Term::ReadLine
 
 # install jdk, ant, psql, mvn, make, libxml, xsltproc, zip, wget
-RUN apt-get -y install openjdk-8-jdk ant maven libxml2-utils xsltproc unzip
+RUN apt-get -y install openjdk-8-jdk ant maven libxml2-utils xsltproc unzip curl
 
 # install convenience apps for debug purposes (vim and jsbeautifier)
 RUN apt-get -y install vim less python-pip
@@ -54,6 +54,10 @@ COPY commul-customization/eurac.png /opt/nginx/html/img/
 RUN mkdir /opt/nginx/html/secure
 COPY commul-customization/shib_test.pl /opt/nginx/html/secure/
 
+# get aai project
+RUN apt-get install -y git
+RUN git clone https://github.com/ufal/lindat-aai-discovery.git /opt/repository/sources/lindat-aai-discovery
+
 # install shibboleth
 COPY commul-customization/shibboleth_sp_with_fastcgi.sh /tmp/
 WORKDIR /tmp
@@ -78,6 +82,14 @@ COPY commul-customization/shibboleth2.xml /opt/shibboleth-sp-fastcgi/etc/shibbol
 COPY commul-customization/lindat.eurac.edu.template.metadata.xml /opt/shibboleth-sp-fastcgi/etc/shibboleth/
 COPY commul-customization/shib_clear_headers /opt/nginx/conf/
 
+# copy over config files
+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
 COPY commul-customization/certs/lindat-dev.key /etc/ssl/private/
 COPY commul-customization/certs/lindat-dev_eurac_edu.pem /etc/ssl/certs/