edu / BeuthBot_WS17 · Commits

Commit e9888632c150c8fa45317afb4756eb4c71348da0

Authored by Benjamin Rühl
1 parent 9b0d04c3
build: skipped

Fix jdbc connection url in standalone.xml to use container name

Inline Side-by-side
Showing 6 changed files with 11 additions and 20 deletions
.gitignore
  View file @e988863
... ... @@ -14,6 +14,7 @@ hs_err_pid*
14 14 # Logfiles
15 15 **.log
16 16 **.log.*
  17 +docker/wildfly/volumes/logs/
17 18  
18 19 **/.DS_Store
19 20 .idea
... ...
docker/docker-compose.yml
  View file @e988863
... ... @@ -38,14 +38,13 @@ services:
38 38 image: postgres
39 39 ports:
40 40 - "5432:5432"
  41 + command: postgres -c logging_collector=on -c log_destination=stderr -c log_directory=/logs
41 42 environment:
42   - POSTGRES_USER: beuthbotuser
  43 + POSTGRES_USER: beuthbot_app
43 44 POSTGRES_PASSWORD: VhS7WPVpdYEHYLpf
44   - POSTGRES_DB: beuthbotdb
  45 + POSTGRES_DB: beuthbot
45 46 volumes:
46   - # - ./postgresql/etc/postgresql.conf:/etc/postgresql.conf
47   - - ./postgresql/var/lib/postgresql/data:/var/lib/postgresql/data
48   - # command: postgres -c config_file=/etc/postgresql.conf
  47 + - ./postgres/volumes/logs:/logs
49 48  
50 49 adminer:
51 50 container_name: adminer_dbmanagement
... ...
docker/postgres/volumes/logs/README.md 0 → 100644
  View file @e988863
  1 +## Log Directory
  2 +This is the log directory which will be mounted into the docker postgres container.
0 3 \ No newline at end of file
... ...
docker/wildfly/modules/org/postgres/main/module.xml deleted 100644 → 0
  View file @9b0d04c
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<module xmlns="urn:jboss:module:1.1" name="org.postgres">
3   - <resources>
4   - <!--https://jdbc.postgresql.org/download.html-->
5   - <resource-root path="postgresql-42.1.4.jar"/>
6   - </resources>
7   - <dependencies>
8   - <module name="javax.api"/>
9   - <module name="javax.transaction.api"/>
10   - <module name="javax.servlet.api" optional="true"/>
11   - </dependencies>
12   -</module>
13 0 \ No newline at end of file
docker/wildfly/standalone.xml
  View file @e988863
... ... @@ -421,11 +421,12 @@
421 421 <subsystem xmlns="urn:jboss:domain:datasources:2.0">
422 422 <datasources>
423 423 <datasource jta="true" jndi-name="java:jboss/datasources/PostgreSQLDS" pool-name="PostgreSQLDS" enabled="true" use-java-context="true">
424   - <connection-url>jdbc:postgresql://localhost:5432/beuthbotdb</connection-url>
425   - <connection-property name="databaseName">beuthbotdb</connection-property>
  424 + <connection-url>jdbc:postgresql://postgres-db:5432/beuthbot</connection-url>
  425 + <connection-property name="url">jdbc:postgresql://postgres-db:5432/beuthbot</connection-property>
  426 + <connection-property name="databaseName">beuthbot</connection-property>
426 427 <driver>postgresql</driver>
427 428 <security>
428   - <user-name>beuthbotuser</user-name>
  429 + <user-name>beuthbot_app</user-name>
429 430 <password>VhS7WPVpdYEHYLpf</password>
430 431 </security>
431 432 <pool>
... ...
docker/wildfly/volumes/modules/org/postgres/main/postgresql-42.1.4.jar 0 → 100644
View file @e988863
No preview for this file type