From b2a668f42bb41ab7dfcca5f41da41aa39289d246 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Mon, 18 Apr 2022 16:35:17 +0200
Subject: [PATCH] #663 - Add postgres container to docker-compose, update
Dockerfile for BudgetMaster 2.10.0
---
.gitignore | 2 ++
Dockerfile | 4 ++--
docker-compose.yaml | 36 ++++++++++++++++++++++++++++++++----
3 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index 50d9a77c4..4718012c6 100644
--- 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
index f313701ea..ab8cb1423 100644
--- 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
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index d004b0a1d..37becad4b 100644
--- 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"
\ No newline at end of file
+ - "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
\ No newline at end of file
--
GitLab