add volume to database and move module to docker compose

hausdoerfer
1 parent 20f8f0f1
Showing 4 changed files with 30 additions and 37 deletions
docker/docker-compose.yml
docker/wildfly/Dockerfile
docker/wildfly/standalone.xml
docker/wildfly/volumes/modules/org/postgres/main/module.xml
@@ -9,10 +9,15 @@ services:
       - "8080:8080"
       - "8787:8787"
       - "9990:9990"
+    environment:
+          POSTGRES_USER: beuthbot_app
+          POSTGRES_PASSWORD: VhS7WPVpdYEHYLpf
+          POSTGRES_DB: beuthbot
     volumes:
       - ./wildfly/volumes/deployments/:/opt/jboss/wildfly/standalone/deployments/
       - ./wildfly/volumes/logs/:/opt/jboss/wildfly/standalone/log/
       - ./wildfly/volumes/conf/:/opt/jboss/wildfly/standalone/conf/
+      - ./wildfly/volumes/modules/org/postgres/main/:/opt/jboss/wildfly/modules/org/postgres/main/
     links:
       - rasa-server
       - postgres-db
@@ -30,14 +35,17 @@ services:
     command: python -m rasa_nlu.server -c config/chatbot_config.json --server_model_dirs=default
   postgres-db:
-    container_name: chatbot-postgres
     image: postgres
     ports:
-       - "5432:5432"
+      - "5432:5432"
     environment:
-      POSTGRES_USER: beuthbot_app
+      POSTGRES_USER: beuthbotuser
       POSTGRES_PASSWORD: VhS7WPVpdYEHYLpf
-      POSTGRES_DB: beuthbot
+      POSTGRES_DB: beuthbotdb
+    volumes:
+       # - ./postgresql/etc/postgresql.conf:/etc/postgresql.conf
+       - ./postgresql/var/lib/postgresql/data:/var/lib/postgresql/data
+    # command: postgres -c config_file=/etc/postgresql.conf
   adminer:
     container_name: adminer_dbmanagement
@@ -2,14 +2,8 @@ FROM jboss/wildfly:10.1.0.Final
 RUN /opt/jboss/wildfly/bin/add-user.sh admin Admin
 COPY standalone.xml /opt/jboss/wildfly/standalone/configuration/standalone.xml
-#USER root
-
-ADD modules/org/postgres/main/postgresql-42.1.4.jar /opt/jboss/wildfly/modules/org/postgres/main/postgresql-42.1.4.jar
-ADD modules/org/postgres/main/module.xml /opt/jboss/wildfly/modules/org/postgres/main/module.xml
-#ADD modules/postgresql-42.1.4.jar /opt/jboss/wildfly/modules/system/layers/base/org/postgres/main/postgresql-42.1.4.jar
-#ADD modules/module.xml /opt/jboss/wildfly/modules/system/layers/base/org/postgres/main/module.xml
+#USER root
-#RUN /subsystem=datasources/jdbc-driver=org.postgresql:add(driver-name=postgresql, driver-module-name=postgresql, driver-xa-datasource-class-name=org.postgresql.xa.PGXADataSource)
-#RUN /subsystem=datasources/xa-data-source=postgresql:add(driver-name=postgresql, jndi-name="java:jboss/datasources/PostgreSQLDS", enabled=true)
-#RUN /subsystem=datasources/xa-data-source=postgresql/xa-datasource-properties=URL:add(value="jdbc:postgresql://localhost:5432/beuthbot")
+#ADD modules/org/postgres/main/postgresql-42.1.4.jar /opt/jboss/wildfly/modules/org/postgres/main/postgresql-42.1.4.jar
+#ADD modules/org/postgres/main/module.xml /opt/jboss/wildfly/modules/org/postgres/main/module.xml
 \ No newline at end of file
@@ -421,11 +421,11 @@
         <subsystem xmlns="urn:jboss:domain:datasources:2.0">
             <datasources>
                 <datasource jta="true" jndi-name="java:jboss/datasources/PostgreSQLDS" pool-name="PostgreSQLDS" enabled="true" use-java-context="true">
-                    <connection-url>jdbc:postgresql://postgres-db:5432/beuthbot</connection-url>
-                    <connection-property name="databaseName">beuthbot</connection-property>
+                    <connection-url>jdbc:postgresql://localhost:5432/beuthbotdb</connection-url>
+                    <connection-property name="databaseName">beuthbotdb</connection-property>
                     <driver>postgresql</driver>
                     <security>
-                        <user-name>beuthbot_app</user-name>
+                        <user-name>beuthbotuser</user-name>
                         <password>VhS7WPVpdYEHYLpf</password>
                     </security>
                     <pool>
@@ -440,27 +440,6 @@
                     </validation>
                 </datasource>
-                <xa-datasource jndi-name="java:jboss/datasources/PgDsXaWildFlyDb" pool-name="PgDsXaWildflyDb" enabled="true" use-java-context="true">
-                    <driver>postgresql</driver>
-                    <xa-datasource-property name="ServerName">postgres-db</xa-datasource-property>
-                    <xa-datasource-property name="PortNumber">5432</xa-datasource-property>
-                    <xa-datasource-property name="DatabaseName">beuthbot</xa-datasource-property>
-                    <xa-pool>
-                        <min-pool-size>5</min-pool-size>
-                        <initial-pool-size>5</initial-pool-size>
-                        <max-pool-size>100</max-pool-size>
-                        <prefill>true</prefill>
-                    </xa-pool>
-                    <validation>
-                        <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker"/>
-                        <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter"/>
-                    </validation>
-                    <security>
-                        <user-name>beuthbot_app</user-name>
-                        <password>VhS7WPVpdYEHYLpf</password>
-                    </security>
-                </xa-datasource>
-
                 <drivers>
                     <driver name="postgresql" module="org.postgres">
                         <driver-class>org.postgresql.Driver</driver-class>
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.1" name="org.postgres">
+    <resources>
+        <!--https://jdbc.postgresql.org/download.html-->
+        <resource-root path="postgresql-42.1.4.jar"/>
+    </resources>
+    <dependencies>
+        <module name="javax.api"/>
+        <module name="javax.transaction.api"/>
+        <module name="javax.servlet.api" optional="true"/>
+    </dependencies>
+</module>
 \ No newline at end of file