diff --git a/.github/workflows/server-ci.yml b/.github/workflows/server-ci.yml index 5be13f02388..0b1ca9b112d 100644 --- a/.github/workflows/server-ci.yml +++ b/.github/workflows/server-ci.yml @@ -82,7 +82,7 @@ jobs: services: # make default-roles-permissions snapshots a live database. postgres: - image: postgres:14 + image: postgres:15 env: POSTGRES_USER: mmuser POSTGRES_PASSWORD: mostest diff --git a/e2e-tests/.ci/server.generate.sh b/e2e-tests/.ci/server.generate.sh index 6dc5624e64c..a3ccd9bc92a 100755 --- a/e2e-tests/.ci/server.generate.sh +++ b/e2e-tests/.ci/server.generate.sh @@ -93,7 +93,7 @@ $(for service in $ENABLED_DOCKER_SERVICES; do $(if mme2e_is_token_in_list "postgres" "$ENABLED_DOCKER_SERVICES"; then echo ' postgres: - image: mattermostdevelopment/mirrored-postgres:14 + image: mattermostdevelopment/mirrored-postgres:15 restart: "no" network_mode: host networks: !reset [] diff --git a/server/build/docker-compose.common.yml b/server/build/docker-compose.common.yml index b92631bf534..475464c30e0 100644 --- a/server/build/docker-compose.common.yml +++ b/server/build/docker-compose.common.yml @@ -5,7 +5,7 @@ x-logging: &default-logging services: postgres: - image: "postgres:14" + image: "postgres:15" logging: *default-logging restart: always networks: diff --git a/server/channels/store/sqlstore/store.go b/server/channels/store/sqlstore/store.go index bedd4b1efd3..49e2e722137 100644 --- a/server/channels/store/sqlstore/store.go +++ b/server/channels/store/sqlstore/store.go @@ -49,7 +49,7 @@ const ( // After 10, it's major and minor only. // 10.1 would be 100001. // 9.6.3 would be 90603. - minimumRequiredPostgresVersion = 140000 + minimumRequiredPostgresVersion = 150000 migrationsDirectionUp migrationDirection = "up" migrationsDirectionDown migrationDirection = "down" diff --git a/server/channels/store/sqlstore/store_test.go b/server/channels/store/sqlstore/store_test.go index d5a636a3dff..5ba889a4691 100644 --- a/server/channels/store/sqlstore/store_test.go +++ b/server/channels/store/sqlstore/store_test.go @@ -541,28 +541,37 @@ func TestCheckVersion(t *testing.T) { ver: "110001", wantLog: "Unsupported Postgres version", wantVersion: "11.1", - wantMinVersion: "14.0", + wantMinVersion: "15.0", }, { ver: "130001", wantLog: "Unsupported Postgres version", wantVersion: "13.1", - wantMinVersion: "14.0", + wantMinVersion: "15.0", }, { - ver: "140000", + ver: "140000", + wantLog: "Unsupported Postgres version", + wantVersion: "14.0", + wantMinVersion: "15.0", }, { - ver: "140019", + ver: "140019", + wantLog: "Unsupported Postgres version", + wantVersion: "14.19", + wantMinVersion: "15.0", }, { ver: "150000", }, + { + ver: "150019", + }, { ver: "90603", wantLog: "Unsupported Postgres version", wantVersion: "9.6.3", - wantMinVersion: "14.0", + wantMinVersion: "15.0", }, { ver: "12.34.1", diff --git a/server/docker-compose.makefile.yml b/server/docker-compose.makefile.yml index b8cd037d5cd..5c8d726954f 100644 --- a/server/docker-compose.makefile.yml +++ b/server/docker-compose.makefile.yml @@ -5,7 +5,7 @@ services: ports: - "5432:5432" volumes: - - "postgres-14-data:/var/lib/postgresql/data" + - "postgres-15-data:/var/lib/postgresql/data" extends: file: build/docker-compose.common.yml service: postgres @@ -125,4 +125,4 @@ networks: ip_range: 192.168.254.0/24 volumes: - postgres-14-data: + postgres-15-data: diff --git a/server/docker-compose.pgvector.yml b/server/docker-compose.pgvector.yml index 785cddc22f4..7b99998d046 100644 --- a/server/docker-compose.pgvector.yml +++ b/server/docker-compose.pgvector.yml @@ -3,6 +3,6 @@ services: postgres: # Override the postgres image to use pgvector - image: "pgvector/pgvector:pg14" + image: "pgvector/pgvector:pg15" # All other settings are inherited from the base service