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
8b8482d8
Commit
8b8482d8
authored
7 years ago
by
Alexander König
Browse files
Options
Downloads
Patches
Plain Diff
added a fix for tomcat not stopping properly
parent
69a55590
No related branches found
No related tags found
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Dockerfile.dist
+9
-4
9 additions, 4 deletions
Dockerfile.dist
commul-customization/catalina.sh
+593
-0
593 additions, 0 deletions
commul-customization/catalina.sh
commul-customization/tomcat8
+1
-1
1 addition, 1 deletion
commul-customization/tomcat8
with
603 additions
and
5 deletions
Dockerfile.dist
+
9
−
4
View file @
8b8482d8
...
...
@@ -33,10 +33,13 @@ RUN mkdir /opt/tomcat8
RUN tar xvzf /tmp/apache-tomcat-8.0.35.tar.gz -C /opt/tomcat8/ --strip-components=1
RUN groupadd tomcat8
RUN useradd -s /bin/false -g tomcat8 -d /opt/tomcat8/ 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/
# doesn't this make more sense?
RUN chown 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 commul-customization/tomcat8 /etc/init.d/
RUN chmod a+x /etc/init.d/tomcat8
...
...
@@ -126,6 +129,8 @@ 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/
# convenience setting of workdir
WORKDIR /opt/repository/workspace/scripts
# afterwards log into the container and do these things by hand
#
...
...
This diff is collapsed.
Click to expand it.
commul-customization/catalina.sh
0 → 100755
+
593
−
0
View file @
8b8482d8
This diff is collapsed.
Click to expand it.
commul-customization/tomcat8
+
1
−
1
View file @
8b8482d8
...
...
@@ -61,7 +61,7 @@ start() {
}
stop
()
{
echo
"Stopping Tomcat 8..."
/bin/su
-s
/bin/bash
$TOMCAT8_USER
-c
$CATALINA_HOME
/bin/shutdown.sh
/bin/su
-s
/bin/bash
$TOMCAT8_USER
-c
'
$CATALINA_HOME/bin/shutdown.sh
-force'
}
case
$1
in
start|stop
)
$1
;;
...
...
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