Merge branch 'release/B4.11.0_F6.7.0' into main

Author: jenkins

.env

@@ -0,0 +1,18 @@
+##
+# The following are environment variable defaults.
+# They can be overridden on the commandline
+##
+
+# Change these to alter the build version
+# Options are
+# 1. a tagged release e.g. 4.10.0
+# 2. a branch e.g. main or develop
+# 3. a git commit hash
+MDM_APPLICATION_COMMIT=4.10.0
+MDM_UI_COMMIT=6.6.0
+
+# Change this to alter the port MDM is published to
+MDM_PORT=8082
+
+# Change this to change the tag assigned to the built docker mdm image
+MDM_TAG=B${MDM_APPLICATION_COMMIT}_F${MDM_UI_COMMIT}

.env.cd

@@ -0,0 +1,18 @@
+##
+# The following are environment variable defaults.
+# They can be overridden on the commandline
+##
+
+# Change these to alter the build version
+# Options are
+# 1. a tagged release e.g. 4.10.0
+# 2. a branch e.g. main or develop
+# 3. a git commit hash
+MDM_APPLICATION_COMMIT=develop
+MDM_UI_COMMIT=develop
+
+# Change this to alter the port MDM is published to
+MDM_PORT=9000
+
+# Change this to change the tag assigned to the built docker mdm image
+MDM_TAG=continuous-development

docker-compose-cd.yml

@@ -1,6 +1,7 @@
 version: '3.8'
 services:
     postgres:
+        image: "maurodatamapper/postgres:12.0-alpine"
         build: ./postgres
         shm_size: 512mb
         environment:
@@ -9,19 +10,19 @@ services:
             - postgres12:/var/lib/postgresql/data
         restart: on-failure
     mauro-data-mapper:
-        image: 'maurodatamapper/mauro-data-mapper:B4.10.0_F6.6.0'
+        image: "maurodatamapper/mauro-data-mapper:${MDM_TAG}"
         build:
             context: mauro-data-mapper
             args:
-                MDM_APPLICATION_COMMIT: 4.10.0
-                MDM_UI_COMMIT: 6.6.0
+                MDM_APPLICATION_COMMIT: 4.11.0
+                MDM_UI_COMMIT: 6.7.0
                 ADDITIONAL_PLUGINS: ""
                 MDM_UI_THEME_NAME: "default"
         environment:
             PGPASSWORD: postgresisawesome
             runtime.config.path: /usr/local/tomcat/conf/runtime.yml
         ports:
-            - "8082:8080"
+            - "${MDM_PORT}:8080"
         depends_on:
             - postgres
         volumes: