Skip to content

Commit

Permalink
Merge pull request #201 from jburel/pg_13
Browse files Browse the repository at this point in the history
Pg 13
  • Loading branch information
jburel authored Jun 6, 2023
2 parents 0eedcd2 + 363bc2f commit 8a66486
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ services:
- ./pgdata:/var/lib/postgresql/data
ports:
- "${POSTGRES_PORT}5432"
environment:
- POSTGRES_HOST_AUTH_METHOD=trust

testintegration:
build:
Expand Down
2 changes: 1 addition & 1 deletion server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion slave/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8a66486

Please sign in to comment.