#663 - Add postgres container to docker-compose, update Dockerfile fo…

…r BudgetMaster 2.10.0
deadlocker8 · Apr 18, 2022 · b2a668f · b2a668f
1 parent c37b21d
commit b2a668f
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,8 @@ certs/
 !BudgetMasterDatabaseMigrator/src/test/resources/*.mv.db
 *.iml
 
+/data
+
 */build/[0-9]*.[0-9]*.[0-9]*
 /error.log
 /application.properties

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 FROM tomcat:9-jdk17
 
 RUN rm -rf /usr/local/tomcat/webapps/*
-COPY build/2.9.2/BudgetMaster-v2.9.2.war $CATALINA_HOME/webapps/ROOT.war
-COPY src/main/resources/config/templates/settings-docker.properties /root/.Deadlocker/BudgetMaster/settings.properties
+COPY BudgetMasterServer/build/2.10.0/BudgetMasterServer-v2.10.0.war $CATALINA_HOME/webapps/ROOT.war
+COPY BudgetMasterServer/src/main/resources/config/templates/settings-docker.properties /root/.Deadlocker/BudgetMaster/settings.properties
 
 EXPOSE 8080
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -1,11 +1,39 @@
 version: '3.3'
 services:
     budgetmaster:
-        image: deadlocker/budgetmaster:latest
-        restart: always
+        image: deadlocker8/budgetmaster:latest
+        restart: unless-stopped
         volumes:
-            - "./data:/root/.Deadlocker/BudgetMaster"
+            - "./data/budgetmaster:/root/.Deadlocker/BudgetMaster"
         expose:
             - "8080"
         ports:
-            - "8080:8080"
+            - "8080:8080"
+        networks:
+            - netPostgres
+        environment:
+            TZ: Europe/Berlin
+            LANG: en_US.UTF-8
+            LANGUAGE: en_US.UTF-8
+            budgetmaster.database.type: postgresql
+            budgetmaster.database.hostname: postgres
+            budgetmaster.database.port: 5432
+            budgetmaster.database.databaseName: budgetmaster
+            budgetmaster.database.username: budgetmaster
+            budgetmaster.database.password: budgetmaster
+        depends_on:
+            -   postgres
+    postgres:
+        image: postgres:latest
+        restart: unless-stopped
+        environment:
+            POSTGRES_DB: budgetmaster
+            POSTGRES_PASSWORD: budgetmaster
+            POSTGRES_USER: budgetmaster
+        networks:
+            - netPostgres
+        volumes:
+            - "./data/postgres:/var/lib/postgresql/data"
+networks:
+    netPostgres:
+        driver: bridge