From 8747d02bbead67440916ac37d961ec621de694ed Mon Sep 17 00:00:00 2001
From: Eric Radman <eradman@starfishstorage.com>
Date: Mon, 6 Oct 2025 09:48:49 -0400
Subject: [PATCH] Use standard PostgreSQL image and drop clean-all target
 (#7555)

---
 .ci/compose.ci.yaml      | 2 +-
 .ci/compose.cypress.yaml | 2 +-
 Makefile                 | 7 +------
 compose.yaml             | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.ci/compose.ci.yaml b/.ci/compose.ci.yaml
index 7c056d0f2..984bf7b12 100644
--- a/.ci/compose.ci.yaml
+++ b/.ci/compose.ci.yaml
@@ -18,7 +18,7 @@ services:
     image: redis:7-alpine
     restart: unless-stopped
   postgres:
-    image: pgautoupgrade/pgautoupgrade:latest
+    image: postgres:18-alpine
     command: "postgres -c fsync=off -c full_page_writes=off -c synchronous_commit=OFF"
     restart: unless-stopped
     environment:
diff --git a/.ci/compose.cypress.yaml b/.ci/compose.cypress.yaml
index 7f769ab3e..ba95f53fe 100644
--- a/.ci/compose.cypress.yaml
+++ b/.ci/compose.cypress.yaml
@@ -66,7 +66,7 @@ services:
     image: redis:7-alpine
     restart: unless-stopped
   postgres:
-    image: pgautoupgrade/pgautoupgrade:latest
+    image: postgres:18-alpine
     command: "postgres -c fsync=off -c full_page_writes=off -c synchronous_commit=OFF"
     restart: unless-stopped
     environment:
diff --git a/Makefile b/Makefile
index c5abda565..d2ed5d910 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: compose_build up test_db create_database clean clean-all down tests lint backend-unit-tests frontend-unit-tests test build watch start redis-cli bash
+.PHONY: compose_build up test_db create_database clean down tests lint backend-unit-tests frontend-unit-tests test build watch start redis-cli bash
 
 compose_build: .env
 	COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build
@@ -32,11 +32,6 @@ clean:
 	docker image prune --force
 	docker volume prune --force
 
-clean-all: clean
-	docker image rm --force \
-		redash/redash:latest redis:7-alpine maildev/maildev:latest \
-		pgautoupgrade/pgautoupgrade:15-alpine3.8 pgautoupgrade/pgautoupgrade:latest
-
 down:
 	docker compose down
 
diff --git a/compose.yaml b/compose.yaml
index 0b1168477..8badaa3fe 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -53,7 +53,7 @@ services:
     image: redis:7-alpine
     restart: unless-stopped
   postgres:
-    image: pgautoupgrade/pgautoupgrade:latest
+    image: postgres:18-alpine
     ports:
       - "15432:5432"
     # The following turns the DB into less durable, but gains significant performance improvements for the tests run (x3