work

Author: thomaswoehlke

etc/docker/docker-compose.yml

@@ -1058,7 +1058,6 @@
                   <files>
                     <file>${project.basedir}/README.md</file>
                     <file>${project.basedir}/LICENSE</file>
-                    <file>${project.basedir}/etc/docker/docker-compose.yml</file>
                     <file>${project.basedir}/app.json</file>
                     <file>${project.basedir}/_config.yml</file>
                     <file>${project.basedir}/Procfile</file>
@@ -1074,6 +1073,7 @@
                     <file>${project.basedir}/build.sh</file>
                     <file>${project.basedir}/etc/run.sh</file>
                     <file>${project.basedir}/etc/bash/psql.sh</file>
+                    <file>${project.basedir}/src/main/resources/docker-compose.yml</file>
                     <file>${project.basedir}/etc/docker-start.sh</file>
                     <file>${project.basedir}/etc/docker-stop.sh</file>
                     <file>${project.basedir}/etc/sql/db-createdb-and-user-linux.sql</file>

pom.xml

@@ -2,37 +2,38 @@
 version: '3.3'
 
 services:
-
-    simpleworklist_dbmaster:
-        image: postgres:latest
-        restart: always
-        networks:
-            - net
-        ports:
-            - 5432:5432
-        environment:
-            POSTGRES_PASSWORD: simpleworklistpwd
-            POSTGRES_USER: simpleworklist
-            POSTGRES_DB: simpleworklist
-    simpleworklist_dbref:
-        image: postgres:latest
-        restart: always
-        networks:
-            - net
-        ports:
-            - 5464:5432
-        environment:
-            POSTGRES_PASSWORD: simpleworklistrefpwd
-            POSTGRES_USER: simpleworklistref
-            POSTGRES_DB: simpleworklistref
-    simpleworklist_adminer:
-        image: adminer:latest
-        restart: always
-        networks:
-            - net
-        ports:
-            - 4000:8080
+  simpleworklist_dbmaster:
+    image: postgres:latest
+    restart: always
+    networks:
+      - net
+    ports:
+      - 5432:5432
+    environment:
+      POSTGRES_PASSWORD: simpleworklistpwd
+      POSTGRES_USER: simpleworklist
+      POSTGRES_DB: simpleworklist
+      CHARSET: de_DE.UTF-8
+      PGPORT: 5432
+  simpleworklist_dbref:
+    image: postgres:latest
+    restart: always
+    networks:
+      - net
+    ports:
+      - 5464:5464
+    environment:
+      POSTGRES_PASSWORD: simpleworklistrefpwd
+      POSTGRES_USER: simpleworklistref
+      POSTGRES_DB: simpleworklistref
+      CHARSET: de_DE.UTF-8
+      PGPORT: 5464
+  simpleworklist_adminer:
+    image: adminer:latest
+    restart: always
+    networks:
+      - net
+    ports:
+      - 4000:40003
 networks:
-    net:
-
-
+  net: