Skip to content

Pg 13#201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jburel merged 3 commits into from
Jun 6, 2023
Merged

Pg 13 #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c3d963
upgrade postgres to version 13
jburel Jan 12, 2023
00db7cf
use pg13
jburel Jan 12, 2023
363bc2f
use env for pg
jburel Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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