From d76a3de80202d99215b2c8e5a90d0d3230383213 Mon Sep 17 00:00:00 2001
From: Ryan Derr <54389874+RyanDerr@users.noreply.github.com>
Date: Wed, 6 May 2026 15:09:17 -0500
Subject: [PATCH] fix(sqltest): Update makefile for sql test to utilie networks
 explicily rather then depricated --link opt (#6688)

---
 internal/db/sqltest/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/internal/db/sqltest/Makefile b/internal/db/sqltest/Makefile
index b85c76b996..08163c60a0 100644
--- a/internal/db/sqltest/Makefile
+++ b/internal/db/sqltest/Makefile
@@ -56,14 +56,18 @@ ifeq ($(DB_LOGS), 1)
 	log_cmd = docker logs $(SQL_TEST_CONTAINER_NAME)
 endif
 
+SQL_TEST_NETWORK_NAME ?= boundary-sql-tests-net
+
 # re-write paths for docker
 dockerized_tests = $(patsubst tests/%,/test/%,$(TESTS))
 
 test:
 	@echo Using $(POSTGRES_DOCKER_IMAGE)
 	@echo Using $(PG_TAP_DOCKER_IMAGE)
+	@docker network create $(SQL_TEST_NETWORK_NAME) 2>/dev/null || true
 	@docker run -d \
 		--name $(SQL_TEST_CONTAINER_NAME) \
+		--network $(SQL_TEST_NETWORK_NAME) \
 		$(DOCKER_ARGS) \
 		-e POSTGRES_PASSWORD=boundary \
 		-e POSTGRES_USER=boundary \
@@ -73,16 +77,16 @@ test:
 		$(POSTGRES_DOCKER_IMAGE)
 	@docker run --rm \
 		--name test \
-		--link $(SQL_TEST_CONTAINER_NAME):db \
+		--network $(SQL_TEST_NETWORK_NAME) \
 		-e DATABASE=boundary \
-		-e HOST=db \
+		-e HOST=$(SQL_TEST_CONTAINER_NAME) \
 		-e PORT=5432 \
 		-e USER=boundary \
 		-e PASSWORD=boundary \
 		-e TESTS="$(PROVE_OPTS) $(dockerized_tests)" \
 		-v "$(CWD)/tests":/test \
 		$(PG_TAP_DOCKER_IMAGE); \
-		(ret=$$?; docker stop $(SQL_TEST_CONTAINER_NAME) > /dev/null 2>&1 && $(log_cmd) && docker rm -f -v $(SQL_TEST_CONTAINER_NAME) > /dev/null 2>&1 && exit $$ret)
+		(ret=$$?; docker stop $(SQL_TEST_CONTAINER_NAME) > /dev/null 2>&1 && $(log_cmd) && docker rm -f -v $(SQL_TEST_CONTAINER_NAME) > /dev/null 2>&1 && docker network rm $(SQL_TEST_NETWORK_NAME) > /dev/null 2>&1 && exit $$ret)
 
 database-up:
 	@echo Using $(POSTGRES_DOCKER_IMAGE)