From b43b4cefdd947ed4628a7e7554707d68c21b4bcd Mon Sep 17 00:00:00 2001 From: deandreJones Date: Wed, 21 Aug 2024 16:03:17 +0000 Subject: [PATCH 1/3] local postgres upgrade to 16.4 --- .circleci/config.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 04448f118e5..2ee59314fa1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ references: # see milmove_load_testing for the right config load_tester: &load_tester cimg/python:3.11.3 - postgres: &postgres cimg/postgres:12.11 + postgres: &postgres cimg/postgres:16.4 redis: &redis redis:5.0.6 diff --git a/Makefile b/Makefile index b7c7633b4b0..1b3075ea321 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ DB_NAME_TEST = test_db DB_DOCKER_CONTAINER_DEV = milmove-db-dev DB_DOCKER_CONTAINER_DEPLOYED_MIGRATIONS = milmove-db-deployed-migrations DB_DOCKER_CONTAINER_TEST = milmove-db-test -DB_DOCKER_CONTAINER_IMAGE = postgres:12.11 +DB_DOCKER_CONTAINER_IMAGE = postgres:16.4 REDIS_DOCKER_CONTAINER_IMAGE = redis:5.0.6 REDIS_DOCKER_CONTAINER = milmove-redis TASKS_DOCKER_CONTAINER = tasks From dbd0b1a8a158d7abd7dc1051c2d6d184f5409192 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Wed, 21 Aug 2024 19:43:39 +0000 Subject: [PATCH 2/3] more postgrese --- docker-compose.ecs.yml | 2 +- docker-compose.local.yml | 2 +- docker-compose.mtls.yml | 2 +- docker-compose.mtls_local.yml | 2 +- docker-compose.prime.yml | 2 +- docker-compose.reviewapp.yml | 2 +- docker-compose.yml | 2 +- migrations/app/schema/20210113173236_create_crud_role.up.sql | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-compose.ecs.yml b/docker-compose.ecs.yml index 78e32f93b55..66677616f4e 100644 --- a/docker-compose.ecs.yml +++ b/docker-compose.ecs.yml @@ -2,7 +2,7 @@ version: '3' services: database: - image: public.ecr.aws/docker/library/postgres:12.7 + image: public.ecr.aws/docker/library/postgres:16.4 environment: - POSTGRES_USER=postgres - POSTGRES_PASSWORD=mysecretpassword diff --git a/docker-compose.local.yml b/docker-compose.local.yml index e43a217bcf0..22ffa99bd5d 100644 --- a/docker-compose.local.yml +++ b/docker-compose.local.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:12.7 + image: postgres:16.4 restart: always ports: - '6432:5432' diff --git a/docker-compose.mtls.yml b/docker-compose.mtls.yml index e9cad7f05b7..4acbdd12d31 100644 --- a/docker-compose.mtls.yml +++ b/docker-compose.mtls.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:12.7 + image: postgres:16.4 restart: always environment: - POSTGRES_USER=postgres diff --git a/docker-compose.mtls_local.yml b/docker-compose.mtls_local.yml index d4a723f2f46..72d19771e47 100644 --- a/docker-compose.mtls_local.yml +++ b/docker-compose.mtls_local.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:12.7 + image: postgres:16.4 restart: always ports: - '6432:5432' diff --git a/docker-compose.prime.yml b/docker-compose.prime.yml index 00ddb359c9c..7096dcd4c23 100644 --- a/docker-compose.prime.yml +++ b/docker-compose.prime.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:12.7 + image: postgres:16.4 restart: always ports: - '6432:5432' diff --git a/docker-compose.reviewapp.yml b/docker-compose.reviewapp.yml index b08321d5135..086e46f7a2d 100644 --- a/docker-compose.reviewapp.yml +++ b/docker-compose.reviewapp.yml @@ -2,7 +2,7 @@ version: '3.4' services: database_review: - image: public.ecr.aws/docker/library/postgres:12.7 + image: public.ecr.aws/docker/library/postgres:16.4 restart: always ports: - '6432:5432' diff --git a/docker-compose.yml b/docker-compose.yml index 815e316a5ab..455816eb4ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:12.7 + image: postgres:16.4 restart: always ports: - '6432:5432' diff --git a/migrations/app/schema/20210113173236_create_crud_role.up.sql b/migrations/app/schema/20210113173236_create_crud_role.up.sql index 8b89cc0139e..189dd6b017b 100644 --- a/migrations/app/schema/20210113173236_create_crud_role.up.sql +++ b/migrations/app/schema/20210113173236_create_crud_role.up.sql @@ -1,6 +1,6 @@ -- Assume the master role, which has the ability to create roles and grant -- group membership to the rds_iam role. -SET ROLE master; +-- SET ROLE master; --commented out because it's not needed for postgres16 -- Create a new role named "crud" (CREATE READ UPDATE DELETE). -- Use NOINHERIT so that this low privileged user cannot assume the privileges From cba790f88a60bcdc47346e17393fb4e10bfae367 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 22 Aug 2024 18:51:28 +0000 Subject: [PATCH 3/3] keep cimg 12.11 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2ee59314fa1..04448f118e5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ references: # see milmove_load_testing for the right config load_tester: &load_tester cimg/python:3.11.3 - postgres: &postgres cimg/postgres:16.4 + postgres: &postgres cimg/postgres:12.11 redis: &redis redis:5.0.6