Skip to content

Commit

Permalink
I got this running and creating the database + schema
Browse files Browse the repository at this point in the history
  • Loading branch information
Jim Van Fleet committed Sep 5, 2016
1 parent 955fcd7 commit 0ec0362
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 98 deletions.
20 changes: 9 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM bigfleet/grouper

ARG maintainer=my
ARG imagename=grouper
ARG version=2.3.0
ARG version=$version

LABEL Version=$version
ENV VERSION=$version
Expand All @@ -15,14 +15,12 @@ ENV MYSQL_PASSWORD=3cf0ccc7d6b240390188367933c9cd90
ENV GROUPER_SYSTEM_PASSWORD=3cf0ccc7d6b240390188367933c9cd90
ENV MYSQL_HOST=mariadb

ADD ./container_files /opt
COPY conf/grouper.hibernate.properties /opt/grouper/$version
ADD container_files /opt
RUN rm /opt/grouper/$version/grouper.apiBinary-$version/conf/grouper.hibernate.properties && \
ln -s /opt/etc/grouper.hibernate.properties /opt/grouper/$version/grouper.apiBinary-$version/conf/grouper.hibernate.properties && \
rm /opt/grouper/$version/grouper.ws-$version/grouper-ws/build/dist/grouper-ws/WEB-INF/classes/grouper.hibernate.properties && \
ln -s /opt/etc/grouper.hibernate.properties /opt/grouper/$version/grouper.ws-$version/grouper-ws/build/dist/grouper-ws/WEB-INF/classes/grouper.hibernate.properties && \
rm /opt/grouper/$version/grouper.ui-$version/dist/grouper/WEB-INF/classes/grouper.hibernate.properties && \
ln -s /opt/etc/grouper.hibernate.properties /opt/grouper/$version/grouper.ui-$version/dist/grouper/WEB-INF/classes/grouper.hibernate.properties

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 && \
ln -s /opt/grouper/$version/grouper.hibernate.properties /opt/grouper/2.3.0/grouper.ws-2.3.0/grouper-ws/build/dist/grouper-ws/WEB-INF/classes/grouper.hibernate.properties && \
rm /opt/grouper/2.3.0/grouper.ui-2.3.0/dist/grouper/WEB-INF/classes/grouper.hibernate.properties && \
ln -s /opt/grouper/$version/grouper.hibernate.properties /opt/grouper/2.3.0/grouper.ui-2.3.0/dist/grouper/WEB-INF/classes/grouper.hibernate.properties

#VOLUME /opt/grouper/2.3.0/apache-tomcat-$TOMCAT_VERSION/logs
#VOLUME /opt/grouper/$version/apache-tomcat-$TOMCAT_VERSION/logs
49 changes: 0 additions & 49 deletions conf/grouper.hibernate.properties

This file was deleted.

36 changes: 0 additions & 36 deletions conf/grouper.installer.properties

This file was deleted.

4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
- NET_ADMIN
- SYS_ADMIN
volumes:
- mysql:/var/lib/mysqlmounted
- grouper_mysql:/var/lib/mysqlmounted
env_file:
- conf/common.env
- conf/db.env
Expand Down Expand Up @@ -45,5 +45,5 @@ networks:
driver: bridge

volumes:
mysql:
grouper_mysql:
driver: local

0 comments on commit 0ec0362

Please sign in to comment.