From f36e0f717f32b09aba0bf025278ac4412121d4fc Mon Sep 17 00:00:00 2001 From: Oliver Freeman Date: Thu, 25 Nov 2021 13:10:10 +0000 Subject: [PATCH 1/9] Add .gitkeep and update gitignore --- .gitignore | 3 ++- mauro-data-mapper/mdm-ui/.gitkeep | 0 shared_volumes/.gitkeep | 0 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 mauro-data-mapper/mdm-ui/.gitkeep create mode 100644 shared_volumes/.gitkeep diff --git a/.gitignore b/.gitignore index 2fd3f53..b64acf9 100644 --- a/.gitignore +++ b/.gitignore @@ -201,4 +201,5 @@ local.properties .worksheet src/main/resources/*.properties -shared_volumes/logs \ No newline at end of file +shared_volumes/* +mauro-data-mapper/mdm-ui/* \ No newline at end of file diff --git a/mauro-data-mapper/mdm-ui/.gitkeep b/mauro-data-mapper/mdm-ui/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/shared_volumes/.gitkeep b/shared_volumes/.gitkeep new file mode 100644 index 0000000..e69de29 From 52a55652d47ccb12a4b9626ebf4cddb0ddc1fa49 Mon Sep 17 00:00:00 2001 From: Oliver Freeman Date: Thu, 25 Nov 2021 13:14:29 +0000 Subject: [PATCH 2/9] gh-2 Ensure theres no collision between API assets and UI assets Set the grails.assets.mapping property which changes the URL mount of the grails assets so that it doesnt collide with the assets from mdm-ui --- mauro-data-mapper/config/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mauro-data-mapper/config/build.yml b/mauro-data-mapper/config/build.yml index 1a54ad3..67a2da7 100644 --- a/mauro-data-mapper/config/build.yml +++ b/mauro-data-mapper/config/build.yml @@ -45,6 +45,8 @@ grails: #exposedHeaders: null #maxAge: 1800 #allowCredentials: true + assets: + mapping: 'api_assets' hibernate: search: default: From b21256a4bda3890c0b32b46ff0df028f2a3f29e7 Mon Sep 17 00:00:00 2001 From: Oliver Freeman Date: Thu, 25 Nov 2021 13:17:10 +0000 Subject: [PATCH 3/9] Fix the release issue where the .env file was not changed and the compose file does not make use of it for the commits --- .env | 4 ++-- docker-compose.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 969595d..709fef4 100644 --- a/.env +++ b/.env @@ -8,8 +8,8 @@ # 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 +MDM_APPLICATION_COMMIT=4.11.0 +MDM_UI_COMMIT=6.7.0 # Change this to alter the port MDM is published to MDM_PORT=8082 diff --git a/docker-compose.yml b/docker-compose.yml index f3fba6f..96da895 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,8 +14,8 @@ services: build: context: mauro-data-mapper args: - MDM_APPLICATION_COMMIT: 4.11.0 - MDM_UI_COMMIT: 6.7.0 + MDM_APPLICATION_COMMIT: "${MDM_APPLICATION_COMMIT}" + MDM_UI_COMMIT: "${MDM_UI_COMMIT}" ADDITIONAL_PLUGINS: "" MDM_UI_THEME_NAME: "default" environment: From 4d96f3b99c0804e38891f2fd04446a4ecdf0c114 Mon Sep 17 00:00:00 2001 From: Oliver Freeman Date: Thu, 25 Nov 2021 13:20:28 +0000 Subject: [PATCH 4/9] Allow customisation of the UI If people drop files into the mdm-ui folder as if its the mdm-ui repo then the files will be dropping in ontop of the release and be used instead Will require the compose file to have the `MDM_UI_THEME_NAME: "default"` changed to ` MDM_UI_THEME_NAME: "custom"` --- mauro-data-mapper/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mauro-data-mapper/Dockerfile b/mauro-data-mapper/Dockerfile index f13cf07..695ac25 100644 --- a/mauro-data-mapper/Dockerfile +++ b/mauro-data-mapper/Dockerfile @@ -25,6 +25,9 @@ RUN cd "$MDM_UI_HOME" && git fetch && git checkout "$MDM_UI_COMMIT" && if [[ `gi # Copy in build.yml COPY config/build.yml $MDM_APPLICATION_HOME/grails-app/conf/build.yml +# Allow customisation of the UI +COPY mdm-ui $MDM_UI_HOME/ + # Build the front and back ends # The front end build will try to use precompiled sources or it will build locally from the given commit/tagU RUN build_frontend.sh From 1689cc59b89682d31028c7a856c9f4ee4a0b4dcb Mon Sep 17 00:00:00 2001 From: Oliver Freeman Date: Fri, 10 Dec 2021 11:26:28 +0000 Subject: [PATCH 5/9] Empty out the email host and port for the defaults as we dont want to provide defaults for these variables --- mauro-data-mapper/config/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mauro-data-mapper/config/build.yml b/mauro-data-mapper/config/build.yml index 67a2da7..e54bd30 100644 --- a/mauro-data-mapper/config/build.yml +++ b/mauro-data-mapper/config/build.yml @@ -22,8 +22,8 @@ simplejavamail: smtp: username: '' password: '' - host: smtp.gmail.com - port: 587 + host: '' + port: '' transportstrategy: SMTP_TLS --- # mdm-plugin-email-proxy Configuration From 730b395052b65aa229b8193a1ad5f92322ac81ae Mon Sep 17 00:00:00 2001 From: Oliver Freeman Date: Mon, 10 Jan 2022 11:38:50 +0000 Subject: [PATCH 6/9] Update frontend build system * Angular 12.2.13 * Node 14.18.1 * NPM 8.3.0 --- 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 695ac25..28969ff 100644 --- a/mauro-data-mapper/Dockerfile +++ b/mauro-data-mapper/Dockerfile @@ -1,5 +1,5 @@ -ARG MDM_BASE_IMAGE_VERSION=grails-4.0.6-jdk12-node-14.16-npm-7.11.R2 +ARG MDM_BASE_IMAGE_VERSION=grails-4.0.6-jdk12-node-14.18.1-npm-8.3.0 ARG TOMCAT_IMAGE_VERSION=9.0.27-jdk12-adoptopenjdk-openj9.R2 FROM maurodatamapper/mdm_base:$MDM_BASE_IMAGE_VERSION AS mdm-build From 3cb0dbbaf0b39ac0af02d984ec255883e88544f9 Mon Sep 17 00:00:00 2001 From: Oliver Freeman Date: Wed, 26 Jan 2022 22:15:53 +0000 Subject: [PATCH 7/9] Update to j17, grails5.1.2 and npm 8.3.0 --- .env.cd | 5 ++++- docker-compose.yml | 1 + mauro-data-mapper/Dockerfile | 4 ++-- mauro-data-mapper/config/build.yml | 5 +++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.env.cd b/.env.cd index b2c58d5..304e500 100644 --- a/.env.cd +++ b/.env.cd @@ -15,4 +15,7 @@ MDM_UI_COMMIT=develop MDM_PORT=9000 # Change this to change the tag assigned to the built docker mdm image -MDM_TAG=continuous-development \ No newline at end of file +MDM_TAG=continuous-development + +# Change this to force a pull and rebuild of the codebase +CACHE_BURST=1 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 96da895..1a484d7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,6 +18,7 @@ services: MDM_UI_COMMIT: "${MDM_UI_COMMIT}" ADDITIONAL_PLUGINS: "" MDM_UI_THEME_NAME: "default" + CACHE_BURST: "${CACHE_BURST}" environment: PGPASSWORD: postgresisawesome runtime.config.path: /usr/local/tomcat/conf/runtime.yml diff --git a/mauro-data-mapper/Dockerfile b/mauro-data-mapper/Dockerfile index 28969ff..521cc95 100644 --- a/mauro-data-mapper/Dockerfile +++ b/mauro-data-mapper/Dockerfile @@ -1,6 +1,6 @@ -ARG MDM_BASE_IMAGE_VERSION=grails-4.0.6-jdk12-node-14.18.1-npm-8.3.0 -ARG TOMCAT_IMAGE_VERSION=9.0.27-jdk12-adoptopenjdk-openj9.R2 +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 FROM maurodatamapper/mdm_base:$MDM_BASE_IMAGE_VERSION AS mdm-build LABEL maintainer="Oliver Freeman " diff --git a/mauro-data-mapper/config/build.yml b/mauro-data-mapper/config/build.yml index e54bd30..995d123 100644 --- a/mauro-data-mapper/config/build.yml +++ b/mauro-data-mapper/config/build.yml @@ -49,5 +49,6 @@ grails: mapping: 'api_assets' hibernate: search: - default: - indexBase: '/lucene' + backend: + directory: + root: '/lucene' From 9c5053d8a3fd378858d7ab362646fe688fcdcb26 Mon Sep 17 00:00:00 2001 From: Oliver Freeman Date: Thu, 27 Jan 2022 12:34:04 +0000 Subject: [PATCH 8/9] Use `allowedOriginPatterns` for cors to allow the '*' option. The allowedOrigins no longer allows the use of a pattern, this should be used to define clear hosts --- mauro-data-mapper/config/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mauro-data-mapper/config/build.yml b/mauro-data-mapper/config/build.yml index 995d123..cdbd26c 100644 --- a/mauro-data-mapper/config/build.yml +++ b/mauro-data-mapper/config/build.yml @@ -39,7 +39,8 @@ grails: cors: enabled: true # The following are the defaults - allowedOrigins: [ '*' ] + # allowedOrigins: [] # Cannot use allowedOrigins with *, they have to be clearly stated origins + allowedOriginPatterns: [ '*' ] allowedMethods: [ 'GET', 'POST', 'PUT', 'DELETE', 'OPTIONS', 'HEAD' ] allowedHeaders: [ 'origin', 'content-type', 'accept', 'authorization', 'pragma', 'cache-control' ] #exposedHeaders: null From 0425c8f9ecdc89b727e38b42e5055cf714944cbf Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 28 Jan 2022 16:17:29 +0000 Subject: [PATCH 9/9] Release B5.0.0_F7.0.0 --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1a484d7..0e29b5b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,8 +14,8 @@ services: build: context: mauro-data-mapper args: - MDM_APPLICATION_COMMIT: "${MDM_APPLICATION_COMMIT}" - MDM_UI_COMMIT: "${MDM_UI_COMMIT}" + MDM_APPLICATION_COMMIT: 5.0.0 + MDM_UI_COMMIT: 7.0.0 ADDITIONAL_PLUGINS: "" MDM_UI_THEME_NAME: "default" CACHE_BURST: "${CACHE_BURST}"