Skip to content
Snippets Groups Projects
Commit c236d4bc authored by Alexander König's avatar Alexander König
Browse files

- changed the mvn dependency pre-pull

- fixed a mistake in adapt_utilities_sql.sh
parent 43c51d49
No related branches found
No related tags found
No related merge requests found
...@@ -54,7 +54,8 @@ COPY commul-customization/tomcat-server.xml /opt/tomcat8/conf/server.xml ...@@ -54,7 +54,8 @@ COPY commul-customization/tomcat-server.xml /opt/tomcat8/conf/server.xml
# pre-fetch maven dependencies # pre-fetch maven dependencies
COPY commul-customization/dspace-pom.xml /tmp/pom.xml COPY commul-customization/dspace-pom.xml /tmp/pom.xml
WORKDIR /tmp/ WORKDIR /tmp/
RUN mvn dependency:resolve # RUN mvn dependency:resolve
RUN mvn -B -T 4 dependency:copy-dependencies dependency:resolve-plugins dependency:go-offline clean
# all files could be copied into a /tmp folder within the container first (maybe that could be mounted?); see also dspace-entrypoint.sh # all files could be copied into a /tmp folder within the container first (maybe that could be mounted?); see also dspace-entrypoint.sh
# this checks if there was a new commit since the last build # this checks if there was a new commit since the last build
ADD https://api.github.com/repos/commul/clarin-dspace/git/refs/heads/commul-custom version.json ADD https://api.github.com/repos/commul/clarin-dspace/git/refs/heads/commul-custom version.json
......
...@@ -4,5 +4,5 @@ git clone https://github.com/commul/clarin-dspace.git -b commul-custom /tmp/dspa ...@@ -4,5 +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/utilities.sql /tmp/sql/
cp /tmp/dspace/utilities/license_definition.txt /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#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 perl -pi -e 's/\$DSPACE_USER/$ENV{DSPACE_USER}/;' /tmp/sql/utilities.sql
rm -rf /tmp/dspace rm -rf /tmp/dspace
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment