Skip to content

Commit 8b2ade9

Browse files
author
jenkins
committed
Merge branch 'release/2023.1' into main
2 parents 7b781fc + 29cf94c commit 8b2ade9

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

.env

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
# 1. a tagged release e.g. 4.10.0
99
# 2. a branch e.g. main or develop
1010
# 3. a git commit hash
11-
MDM_APPLICATION_COMMIT=5.2.0
12-
MDM_UI_COMMIT=7.2.0
11+
MDM_APPLICATION_COMMIT=5.3.0
12+
MDM_UI_COMMIT=7.3.0
1313

1414
# Change this to alter the port MDM is published to
1515
MDM_PORT=8082
1616

1717
# Change this to change the tag assigned to the built docker mdm image
18-
MDM_TAG=2022.3
18+
MDM_TAG=2023.1

NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2020 University of Oxford
1+
Copyright 2020-2023 University of Oxford and NHS England
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.8'
22
services:
33
postgres:
4-
image: "maurodatamapper/postgres:12.0-alpine"
4+
image: "maurodatamapper/postgres:12.14-alpine"
55
build: ./postgres
66
shm_size: 512mb
77
environment:

mauro-data-mapper/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
ARG MDM_BASE_IMAGE_VERSION=grails-5.1.9-jdk17.0.3_7-node-14.18.1-npm-8.3.0.R2
3-
ARG TOMCAT_IMAGE_VERSION=9.0.65-jre17-temurin
2+
ARG MDM_BASE_IMAGE_VERSION=grails-5.3.2-jdk17.0.6_10-node-16.10.0-npm-8.3.0
3+
ARG TOMCAT_IMAGE_VERSION=9.0.71-jre17-temurin
44

55
FROM maurodatamapper/mdm_base:$MDM_BASE_IMAGE_VERSION AS mdm-build
66
LABEL org.opencontainers.image.authors="Oliver Freeman <oliver.freeman@bdi.ox.ac.uk>, Joe Crawford <joseph.crawford@bdi.ox.ac.uk>"

postgres/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:12.10-alpine
1+
FROM postgres:12.14-alpine
22
COPY fixtures /docker-entrypoint-initdb.d
33

44
ENV POSTGRES_PASSWORD=postgresisawesome \

0 commit comments

Comments
 (0)