Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
clarin-dspace
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
commul
docker
clarin-dspace
Commits
c236d4bc
Commit
c236d4bc
authored
6 years ago
by
Alexander König
Browse files
Options
Downloads
Patches
Plain Diff
- 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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dockerfiles/Dockerfile.dspace
+2
-1
2 additions, 1 deletion
dockerfiles/Dockerfile.dspace
dockerfiles/adapt_utilities_sql.sh
+1
-1
1 addition, 1 deletion
dockerfiles/adapt_utilities_sql.sh
with
3 additions
and
2 deletions
dockerfiles/Dockerfile.dspace
+
2
−
1
View file @
c236d4bc
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
dockerfiles/adapt_utilities_sql.sh
+
1
−
1
View file @
c236d4bc
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment