You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2015/11/12 15:55:52 UTC
[5/6] marmotta git commit: MARMOTTA-588: fixed psql setup
MARMOTTA-588: fixed psql setup
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/92fadba3
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/92fadba3
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/92fadba3
Branch: refs/heads/MARMOTTA-588
Commit: 92fadba3de462285b657ef2d83446273aa6dd0ad
Parents: 1e63316
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Nov 12 15:55:04 2015 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Nov 12 15:55:04 2015 +0100
----------------------------------------------------------------------
launchers/marmotta-webapp/Dockerfile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/92fadba3/launchers/marmotta-webapp/Dockerfile
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/Dockerfile b/launchers/marmotta-webapp/Dockerfile
index f7db670..26713a8 100644
--- a/launchers/marmotta-webapp/Dockerfile
+++ b/launchers/marmotta-webapp/Dockerfile
@@ -38,6 +38,7 @@ RUN service postgresql start \
&& psql --command "CREATE USER $DB_USER WITH PASSWORD '$DB_PASS';" \
&& psql --command "CREATE DATABASE $DB_NAME WITH OWNER $DB_USER;"
USER root
+RUN service postgresql stop
RUN echo "host all all 127.0.0.1/32 md5" >> /etc/postgresql/$PG_VERSION/main/pg_hba.conf
RUN echo "listen_addresses='*'" >> /etc/postgresql/$PG_VERSION/main/postgresql.conf
@@ -60,13 +61,14 @@ RUN echo "security.enabled = false" > $CONF_PATH
RUN echo "database.type = postgres" >> $CONF_PATH
RUN echo "database.url = jdbc:postgresql://localhost:5432/$DB_NAME?prepareThreshold=3" >> $CONF_PATH
RUN echo "database.user = $DB_USER" >> $CONF_PATH
-RUN echo "database.password = $dbpas" >> $CONF_PATH
+RUN echo "database.password = $DB_PASS" >> $CONF_PATH
RUN chown -R tomcat7:tomcat7 "$(dirname $CONF_PATH)"
# cleanup
#RUN mvn clean
RUN apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
-CMD service tomcat7 start; \
+CMD service postgresql start; \
+ service tomcat7 start; \
tail -f /var/log/tomcat7/catalina.out