From d1b7ccc454f895674e5c99e41066efc9fdff3a85 Mon Sep 17 00:00:00 2001
From: Nick Misasi <nick.misasi@mattermost.com>
Date: Mon, 15 Sep 2025 14:58:43 -0400
Subject: [PATCH] Add support for pgvector in local dev (#33900)

---
 server/Makefile                    | 22 ++++++++++++++++++++++
 server/docker-compose.pgvector.yml |  8 ++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 server/docker-compose.pgvector.yml

diff --git a/server/Makefile b/server/Makefile
index 588fa185204..9bbd75775ff 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -221,6 +221,13 @@ ifeq ($(ARM_BASED_MAC),true)
   DOCKER_COMPOSE_OVERRIDE := -f docker-compose.makefile.m1.yml $(DOCKER_COMPOSE_OVERRIDE)
 endif
 
+# Support for pgvector postgres image
+MM_USE_PGVECTOR ?= false
+ifeq ($(MM_USE_PGVECTOR),true)
+  $(info Using pgvector/pgvector image for PostgreSQL)
+  DOCKER_COMPOSE_OVERRIDE := -f docker-compose.pgvector.yml $(DOCKER_COMPOSE_OVERRIDE)
+endif
+
 ifneq ($(DOCKER_SERVICES_OVERRIDE),true)
   ifeq (,$(findstring minio,$(ENABLED_DOCKER_SERVICES)))
     TEMP_DOCKER_SERVICES:=$(TEMP_DOCKER_SERVICES) minio
@@ -240,6 +247,9 @@ else ifeq ($(MM_NO_DOCKER),true)
 	@echo No Docker Enabled: skipping docker start
 else
 	@echo Starting docker containers
+ifeq ($(MM_USE_PGVECTOR),true)
+	@echo Using pgvector PostgreSQL image
+endif
 
 	docker compose rm start_dependencies
 	$(GO) run ./build/docker-compose-generator/main.go $(ENABLED_DOCKER_SERVICES) | docker compose -f docker-compose.makefile.yml -f /dev/stdin $(DOCKER_COMPOSE_OVERRIDE) run -T --rm start_dependencies
@@ -577,10 +587,16 @@ build-templates: ## Compile all mjml email templates
 
 run-server: setup-go-work prepackaged-binaries validate-go-version start-docker client ## Starts the server.
 	@echo Running mattermost for development
+ifeq ($(MM_USE_PGVECTOR),true)
+	@echo With pgvector PostgreSQL support enabled
+endif
 
 	mkdir -p $(BUILD_WEBAPP_DIR)/channels/dist/files
 	$(GO) run $(GOFLAGS) -ldflags '$(LDFLAGS)' -tags '$(BUILD_TAGS)' $(PLATFORM_FILES) $(RUN_IN_BACKGROUND)
 
+run-server-pgvector: ## Starts the server with pgvector PostgreSQL image.
+	@MM_USE_PGVECTOR=true $(MAKE) run-server
+
 debug-server: start-docker ## Compile and start server using delve.
 	mkdir -p $(BUILD_WEBAPP_DIR)/channels/dist/files
 	$(DELVE) debug $(PLATFORM_FILES) --build-flags="-ldflags '\
@@ -635,6 +651,9 @@ run-client-fullmap: client ## Legacy alias to run-client
 
 run: run-server run-client ## Runs the server and webapp.
 
+run-pgvector: ## Runs the server and webapp with pgvector PostgreSQL image.
+	@MM_USE_PGVECTOR=true $(MAKE) run
+
 run-fullmap: run-server run-client ## Legacy alias to run
 
 stop-server: ## Stops the server.
@@ -665,6 +684,9 @@ restart: restart-server restart-client ## Restarts the server and webapp.
 
 restart-server: | stop-server run-server ## Restarts the mattermost server to pick up development change.
 
+restart-server-pgvector: ## Restarts the server with pgvector PostgreSQL image.
+	@MM_USE_PGVECTOR=true $(MAKE) restart-server
+
 restart-haserver:
 	@echo Restarting mattermost in an HA topology
 
diff --git a/server/docker-compose.pgvector.yml b/server/docker-compose.pgvector.yml
new file mode 100644
index 00000000000..5757208ecfd
--- /dev/null
+++ b/server/docker-compose.pgvector.yml
@@ -0,0 +1,8 @@
+# Override file to use pgvector/pgvector image instead of standard postgres
+# This file is used when MM_USE_PGVECTOR=true is set
+services:
+  postgres:
+    # Override the postgres image to use pgvector
+    image: "pgvector/pgvector:pg13"
+    # All other settings are inherited from the base service
+