test(docker-compose): add optional postgres db for zaakbrug

CONTRIBUTING.md

@@ -47,7 +47,15 @@ ZaakBrug Console can accessed from `host.docker.internal:9000/zaakbrug/`
 ZaakBrug is also exposed on `host.docker.internal:8080/`
 
 #### Configuration
-By default ZaakBrug uses a filebased H2 database for storing the last used zaak and documenten identifiers. To facilitate easy swapping between development with docker-compose and the Frank!Runner, the default mount for the database file is `../frank-runner/data`. Using the same database file between the Frank!Runner and docker-compose prevents errors surrounding duplicate identifiers while running tests against OpenZaak. If you don't have the Frank!Runner installed, you can use `./data` that is commented out instead.
+By default ZaakBrug uses a filebased H2 database for storing the last used zaak and documenten identifiers. To facilitate easy swapping between development with docker-compose and the Frank!Runner, the default mount for the database file is `../frank-runner/data`. Using the same database file between the Frank!Runner and docker-compose prevents errors surrounding duplicate identifiers while running tests against OpenZaak. If you don't have the Frank!Runner installed, you can use `./data` that is commented out instead or add a volume for it.
+
+### Postgres
+Instead of the default filebased H2 database, a Postgresql database can be used too. Adding `-f ./docker-compose.zaakbrug.postgres.yml` to your `docker-compose up` command is all that is needed for this.
+
+For example: `docker-compose -f ./docker-compose.zaakbrug.dev.yml -f ./docker-compose.zaakbrug.postgres.yml up --build`
+
+> Note: Database data is not seamlessly shared with the Frank!Runner out-off-the-box. In `src/webapp/META_INF/context.xml` you can comment out the H2 configuration and uncomment the Postgress one. The Frank!Runner will then use the Postgres database used in the docker-compose.
+
 
 ## docker-compose.zaakbrug.staging.dev
 Contains an instance of OpenZaak specifically configured to act as cache or staging for ZGW to ZDS translations. It shares a network with ZaakBrug, and should be considered a component of the ZaakBrug deployment for when ZGW to ZDS translations are required.

docker-compose.zaakbrug.dev.yml

@@ -23,7 +23,7 @@ services:
     environment:
       - zaakbrug.zds.timezone=UTC
       - TZ=Europe/Amsterdam
-    volumes: &zaakbrug-database-data
+    volumes:
       - ../frank-runner/data:/usr/local/tomcat/data
       - logs:/usr/local/tomcat/logs
       # - ./data:/usr/local/tomcat/data
@@ -36,7 +36,6 @@ services:
 
 volumes:
   logs:
-  database-data:
   media:
   private-media:
 

docker-compose.zaakbrug.postgres.yml

@@ -0,0 +1,33 @@
+version: '3.8'
+
+x-zaakbrug-postgres-env:
+  environment: &zaakbrug-postgres-env
+    POSTGRES_USER: zaakbrug
+    POSTGRES_PASSWORD: zaakbrug
+    POSTGRES_DB: zaakbrug
+
+services:
+  zaakbrug-postgres:
+    image: postgres:${POSTGRES_VERSION:-14}
+    environment: 
+      <<: *zaakbrug-postgres-env
+      POSTGRES_HOST_AUTH_METHOD: trust
+    ports:
+      - 5400:5432
+    networks:
+      - zaakbrug-backend
+    volumes:
+      - zaakbrug-postgres-data:/var/lib/postgresql/data
+
+  zaakbrug:
+    environment: 
+      <<: *zaakbrug-postgres-env
+      DB_HOSTNAME: zaakbrug-postgres
+      DB_PORT: 5432
+    volumes:
+      - ./docker/zaakbrug-postgres/context.xml:/usr/local/tomcat/conf/Catalina/localhost/ROOT.xml:rw
+    depends_on:
+      - zaakbrug-postgres
+
+volumes:
+  zaakbrug-postgres-data:

docker/zaakbrug-postgres/context.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context>
+	<JarScanner scanClassPath="false" scanAllFiles="false" scanAllDirectories="false"/>
+	<Resource name="jdbc/${database.instance.name:-zaakbrug}" auth="Container"
+              type="javax.sql.DataSource"
+              driverClassName="org.postgresql.Driver"
+              url="jdbc:postgresql://${DB_HOSTNAME:-zaakbrug-postgres}:${DB_PORT:-5432}/${POSTGRES_DB:-zaakbrug}"
+              username="${POSTGRES_USER:-zaakbrug}"
+              password="${POSTGRES_PASSWORD:-zaakbrug}" />
+</Context>

src/main/webapp/META-INF/context.xml

@@ -7,4 +7,12 @@
 			factory="org.apache.naming.factory.BeanFactory"
 			URL="jdbc:h2:./data/zaakbrug"
 	/>
+
+	<!-- <Resource name="jdbc/zaakbrug" auth="Container"
+              type="javax.sql.DataSource"
+              driverClassName="org.postgresql.Driver"
+              url="jdbc:postgresql://${jdbc.hostname:-localhost}:5400/zaakbrug"
+              username="${database/username:-zaakbrug}"
+              password="${database/password:-zaakbrug}"
+    /> -->
 </Context>