From 0c3d9631fdcd96b3b4be967c35609a4dc6fd86b3 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Thu, 12 Jan 2023 11:07:13 +0000
Subject: [PATCH 1/3] upgrade postgres to version 13

---
 server/Dockerfile | 2 +-
 slave/Dockerfile  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/Dockerfile b/server/Dockerfile
index 6861fdbd..5ae435b6 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -51,7 +51,7 @@ WORKDIR /tmp/omero-install/linux
 RUN JAVAVER=$JAVAVER ICEVER=$ICEVER PGVER=nopg bash install_centos7.sh
 
 # install postgres tools
-RUN yum -y install postgresql10 \
+RUN yum -y install postgresql13 \
     && yum clean all
 
 EXPOSE 4064
diff --git a/slave/Dockerfile b/slave/Dockerfile
index 213d3817..98086bbe 100644
--- a/slave/Dockerfile
+++ b/slave/Dockerfile
@@ -57,7 +57,7 @@ RUN curl -fSLO http://downloads.sourceforge.net/project/findbugs/findbugs/$FINDB
 RUN yum -y install maven ant && yum clean all
 
 # install postgres tools
-RUN yum -y install postgresql10-server postgresql10 \
+RUN yum -y install postgresql13-server postgresql13 \
     && yum clean all
 
 # gradle

From 00db7cfa3f72f427e404c92a0647c3f1e7c81843 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Thu, 12 Jan 2023 11:41:51 +0000
Subject: [PATCH 2/3] use pg13

---
 .env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env b/.env
index 83671d0f..62f77934 100644
--- a/.env
+++ b/.env
@@ -24,7 +24,7 @@ REPO_CURATED=/tmp/curated
 REPO_CONFIG=/tmp/config
 
 # Variables for controlling external dependencies versions
-POSTGRES_VERSION=10
+POSTGRES_VERSION=13
 NGINX_VERSION=1.15
 
 # Other variables

From 363bc2f1db331da70299a6f6dde9d1affaf5dd38 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 17 Jan 2023 16:22:16 +0000
Subject: [PATCH 3/3] use env for pg

---
 docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 0b759ee0..7a9e7246 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,6 +26,8 @@ services:
             - ./pgdata:/var/lib/postgresql/data
         ports:
             - "${POSTGRES_PORT}5432"
+        environment:
+            - POSTGRES_HOST_AUTH_METHOD=trust
 
     testintegration:
         build: