Merge branch 'release/2022.2' into main

MauroDataMapper · Apr 29, 2022 · bd40c91 · bd40c91
2 parents cdfc8dd + 0edebef
commit bd40c91
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.env b/.env
@@ -8,11 +8,11 @@
 # 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=5.0.0
-MDM_UI_COMMIT=7.0.0
+MDM_APPLICATION_COMMIT=5.1.0
+MDM_UI_COMMIT=7.1.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=2022.1
+MDM_TAG=2022.2
diff --git a/mauro-data-mapper/Dockerfile b/mauro-data-mapper/Dockerfile
@@ -1,6 +1,6 @@
 
-ARG MDM_BASE_IMAGE_VERSION=grails-5.1.2-jdk17.0.1_12-node-14.18.1-npm-8.3.0
-ARG TOMCAT_IMAGE_VERSION=9.0.58-jre17-temurin
+ARG MDM_BASE_IMAGE_VERSION=grails-5.1.7-jdk17.0.3_7-node-14.18.1-npm-8.3.0
+ARG TOMCAT_IMAGE_VERSION=9.0.62-jre17-temurin
 
 FROM maurodatamapper/mdm_base:$MDM_BASE_IMAGE_VERSION AS mdm-build
 LABEL maintainer="Oliver Freeman <[email protected]>"