diff --git a/Dockerfile b/Dockerfile index a905a81..5ff4688 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,6 @@ ENV TOMCAT_VERSION="6.0.35" ADD ./container_files /opt/ COPY conf/grouper.hibernate.properties /opt/grouper/$version -COPY conf/grouper.installer.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 && \ diff --git a/container_files/bin/configure.sh b/container_files/bin/configure.sh index 4ba2731..9287e80 100755 --- a/container_files/bin/configure.sh +++ b/container_files/bin/configure.sh @@ -1,19 +1,13 @@ #!/bin/bash log="/tmp/grouper-configure.log" date >> $log -sed -i "s|#GROUPER_SYSTEM_PASSWORD#|$GROUPER_SYSTEM_PASSWORD|g" /opt/grouper/2.3.0/grouper.installer.properties sed -i "s|#MYSQL_HOST#|$MYSQL_HOST|g" /opt/grouper/2.3.0/grouper.hibernate.properties -sed -i "s|#MYSQL_HOST#|$MYSQL_HOST|g" /opt/grouper/2.3.0/grouper.installer.properties sed -i "s|#MYSQL_USER#|$MYSQL_USER|g" /opt/grouper/2.3.0/grouper.hibernate.properties -sed -i "s|#MYSQL_USER#|$MYSQL_USER|g" /opt/grouper/2.3.0/grouper.installer.properties sed -i "s|#MYSQL_PASSWORD#|$MYSQL_PASSWORD|g" /opt/grouper/2.3.0/grouper.hibernate.properties -sed -i "s|#MYSQL_PASSWORD#|$MYSQL_PASSWORD|g" /opt/grouper/2.3.0/grouper.installer.properties sed -i "s|#MYSQL_DATABASE#|$MYSQL_DATABASE|g" /opt/grouper/2.3.0/grouper.hibernate.properties -sed -i "s|#MYSQL_DATABASE#|$MYSQL_DATABASE|g" /opt/grouper/2.3.0/grouper.installer.properties cat /opt/grouper/2.3.0/grouper.hibernate.properties > $log -cat /opt/grouper/2.3.0/grouper.installer.properties > $log