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
55773501
Commit
55773501
authored
7 years ago
by
Alexander König
Browse files
Options
Downloads
Patches
Plain Diff
some more changes to the Dockerfile to deal with varying deploy scenarios
parent
62a0cee8
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Dockerfile.dist
+11
-3
11 additions, 3 deletions
Dockerfile.dist
with
11 additions
and
3 deletions
Dockerfile.dist
+
11
−
3
View file @
55773501
...
...
@@ -35,14 +35,16 @@ RUN groupadd tomcat8
RUN useradd -s /bin/false -g tomcat8 -d /opt/tomcat8/ tomcat8
# doesn't this make more sense?
RUN chown tomcat8:tomcat8 /opt/tomcat8
RUN chown
-R
tomcat8:tomcat8 /opt/tomcat8
# RUN chgrp -R tomcat8 /opt/tomcat8/
# RUN chmod -R g+r /opt/tomcat8/conf/
# RUN chmod g+x /opt/tomcat8/conf/
# RUN chown -R tomcat8 /opt/tomcat8/webapps/ /opt/tomcat8/work/ /opt/tomcat8/temp/ /opt/tomcat8/logs/
# copy the init script
# copy the init script
and the modified catalina.sh
COPY commul-customization/tomcat8 /etc/init.d/
RUN chmod a+x /etc/init.d/tomcat8
COPY commul-customization/catalina.sh /opt/tomcat8/bin/
RUN chown tomcat8:tomcat8 /opt/lindat-dspace/installation/log/*
# build nginx
RUN apt-get install -y gcc zlib1g zlib1g-dev libpcre3 libpcre3-dev curl cpanminus
...
...
@@ -130,9 +132,15 @@ RUN make aai.min.js
COPY commul-customization/certs/lindat-dev.key /etc/ssl/private/
COPY commul-customization/certs/lindat-dev_eurac_edu.pem /etc/ssl/certs/
# copy certificate for lindat
# if deployed on lindat instead of lindat-dev comment the two lines above and uncomment the following 6 lines
## copy certificate for lindat
# COPY commul-customization/certs/lindat_eurac_edu.key /etc/ssl/private/
# COPY commul-customization/certs/lindat_eurac_edu.crt /etc/ssl/certs/
# COPY docker-lindat-dev2lindat.sh /tmp/
# RUN chmod +x /tmp/docker-lindat-dev2lindat.sh
# RUN /tmp/docker-lindat-dev2lindat.sh
# RUN grep -rl lindat-dev /opt/lindat-common/public/ | xargs -i perl -pi -e 's/lindat-dev/lindat/g' {}
# convenience setting of workdir
...
...
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