Skip to content

Commit

Permalink
Added changes in dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
villadalmine committed Sep 7, 2016
1 parent 3fdcb9a commit 2b61eea
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 56 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ ENV VERSION=$version
ENV TOMCAT_VERSION="6.0.35"

ADD ./container_files /opt/
COPY container_files/firsttimerunning /tmp
COPY conf/grouper.hibernate.properties /opt/grouper/$version

RUN rm /opt/grouper/2.3.0/grouper.apiBinary-2.3.0/conf/grouper.hibernate.properties && \
ln -s /opt/grouper/$version/grouper.hibernate.properties /opt/grouper/2.3.0/grouper.apiBinary-2.3.0/conf/grouper.hibernate.properties && \
rm /opt/grouper/2.3.0/grouper.ws-2.3.0/grouper-ws/build/dist/grouper-ws/WEB-INF/classes/grouper.hibernate.properties && \
Expand All @@ -20,3 +20,4 @@ RUN rm /opt/grouper/2.3.0/grouper.apiBinary-2.3.0/conf/grouper.hibernate.propert

RUN ls /root && ls -l /tmp && cat /opt/grouper/$version/grouper.hibernate.properties && cat /opt/grouper/$version/grouper.installer.properties
VOLUME /opt/grouper/$version/apache-tomcat-$TOMCAT_VERSION/logs
VOLUME /etc/httpd/logs
41 changes: 0 additions & 41 deletions container_files/bin/start.sh

This file was deleted.

13 changes: 0 additions & 13 deletions container_files/configure.sh

This file was deleted.

3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ services:
- NET_ADMIN
- SYS_ADMIN
volumes:
- ./logs:/opt/grouper/2.3.0/apache-tomcat-6.0.35/logs
- ./logs/apache-tomcat:/opt/grouper/2.3.0/apache-tomcat-6.0.35/logs
- ./logs/httpd:/etc/httpd/logs
env_file:
- conf/common.env
- conf/grouper.env
Expand Down

0 comments on commit 2b61eea

Please sign in to comment.