From efd030d42e65075bb4f2cd7e62adc8d0746719f1 Mon Sep 17 00:00:00 2001 From: Oliver Freeman Date: Mon, 14 Mar 2022 17:11:45 +0000 Subject: [PATCH 1/3] Update to use the MDM_BASE_IMAGE_VERSION=grails-5.1.2-jdk17.0.1_12-node-14.18.1-npm-8.3.0.R1 This will allow us to use the precompiled builds for nhs-digital mdm-ui --- mauro-data-mapper/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mauro-data-mapper/Dockerfile b/mauro-data-mapper/Dockerfile index 521cc95..e439876 100644 --- a/mauro-data-mapper/Dockerfile +++ b/mauro-data-mapper/Dockerfile @@ -1,5 +1,5 @@ -ARG MDM_BASE_IMAGE_VERSION=grails-5.1.2-jdk17.0.1_12-node-14.18.1-npm-8.3.0 +ARG MDM_BASE_IMAGE_VERSION=grails-5.1.2-jdk17.0.1_12-node-14.18.1-npm-8.3.0.R1 ARG TOMCAT_IMAGE_VERSION=9.0.58-jre17-temurin FROM maurodatamapper/mdm_base:$MDM_BASE_IMAGE_VERSION AS mdm-build From e8345059a31316a8a10303312d93d6f514383cc3 Mon Sep 17 00:00:00 2001 From: Oliver Freeman Date: Fri, 29 Apr 2022 12:51:04 +0100 Subject: [PATCH 2/3] Update to use the security fixed mdm builds --- mauro-data-mapper/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mauro-data-mapper/Dockerfile b/mauro-data-mapper/Dockerfile index e439876..dd40b6a 100644 --- 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.R1 -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 " From 0edebefd11e13b12add67f1d84b1e25b4f6d911c Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 29 Apr 2022 18:49:48 +0100 Subject: [PATCH 3/3] Release 2022.2 :: B5.1.0_F7.1.0 --- .env | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 652b50a..994229b 100644 --- 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