[PATCH 1 of 2] Docker-friendly default configuration

Wald Commits scm-commit at wald.intevation.org
Mon Jul 25 13:37:30 CEST 2022


# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1658745042 -7200
#      Mon Jul 25 12:30:42 2022 +0200
# Branch 3.2.x
# Node ID 492f8e615c38bf0205adb9832e219079db424e5f
# Parent  fff6c15cdcb1c6e799c7cb2052ff54b88d509313
Docker-friendly default configuration

diff -r fff6c15cdcb1 -r 492f8e615c38 artifacts/doc/conf/backend-db.xml
--- a/artifacts/doc/conf/backend-db.xml	Mon Jul 25 11:48:32 2022 +0200
+++ b/artifacts/doc/conf/backend-db.xml	Mon Jul 25 12:30:42 2022 +0200
@@ -5,7 +5,7 @@
     <password>d4e</password>
     <dialect>org.hibernate.dialect.PostgreSQLDialect</dialect>
     <driver>org.postgresql.Driver</driver>
-    <url>jdbc:postgresql://localhost:5432/d4e</url>
+    <url>jdbc:postgresql://d4eriver-db:5432/</url>
     <validation-query>select 1 from rivers</validation-query>
     <max-wait>30000</max-wait>
 </backend-database>
diff -r fff6c15cdcb1 -r 492f8e615c38 artifacts/doc/conf/rest-server.xml
--- a/artifacts/doc/conf/rest-server.xml	Mon Jul 25 11:48:32 2022 +0200
+++ b/artifacts/doc/conf/rest-server.xml	Mon Jul 25 12:30:42 2022 +0200
@@ -2,5 +2,5 @@
 <rest-server>
     <!--  The port which the ArtifactDatabase (ArtifactServer) will bind to. -->
     <port>8181</port>
-    <listen>localhost</listen>
+    <listen>0.0.0.0</listen>
 </rest-server>
diff -r fff6c15cdcb1 -r 492f8e615c38 artifacts/doc/conf/seddb-db.xml
--- a/artifacts/doc/conf/seddb-db.xml	Mon Jul 25 11:48:32 2022 +0200
+++ b/artifacts/doc/conf/seddb-db.xml	Mon Jul 25 12:30:42 2022 +0200
@@ -5,7 +5,7 @@
     <password>seddb</password>
     <dialect>org.hibernate.dialect.PostgreSQLDialect</dialect>
     <driver>org.postgresql.Driver</driver>
-    <url>jdbc:postgresql://localhost:5432/seddb</url>
+    <url>jdbc:postgresql://d4eriver-db:5432/seddb</url>
     <validation-query>select 1 from gewaesser</validation-query>
     <max-wait>30000</max-wait>
     <!--
diff -r fff6c15cdcb1 -r 492f8e615c38 docker/README
--- a/docker/README	Mon Jul 25 11:48:32 2022 +0200
+++ b/docker/README	Mon Jul 25 12:30:42 2022 +0200
@@ -1,9 +1,4 @@
 Configure:
-_ Change 'localhost' to 'd4eriver-db' in artifacts/doc/conf/backend-db.xml
-  and artifacts/doc/conf/seddb-db.xml
-_ Change 'localhost' to '0.0.0.0' in artifacts/doc/conf/rest-server.xml
-_ Change 'localhost' to 'd4eriver-artifacts' in the server-url parameter in
-  gwt-client/src/main/webapp/WEB-INF/web.xml
 _ Change 'localhost' to the hostname of your docker host in
   artifacts/doc/conf/floodmap.xml and artifacts/doc/conf/rivermap.xml
 
diff -r fff6c15cdcb1 -r 492f8e615c38 gwt-client/src/main/webapp/WEB-INF/web.xml
--- a/gwt-client/src/main/webapp/WEB-INF/web.xml	Mon Jul 25 11:48:32 2022 +0200
+++ b/gwt-client/src/main/webapp/WEB-INF/web.xml	Mon Jul 25 12:30:42 2022 +0200
@@ -14,7 +14,7 @@
 
     <context-param>
         <param-name>server-url</param-name>
-        <param-value>http://localhost:8181</param-value>
+        <param-value>http://d4eriver-artifacts:8181</param-value>
     </context-param>
 
     <context-param>


More information about the Dive4Elements-commits mailing list