Skip to content

Commit 1c95584

Browse files
committed
Update db-up-test, db-down-test with new setup
1 parent 1f58315 commit 1c95584

File tree

3 files changed

+20
-13
lines changed

3 files changed

+20
-13
lines changed

Makefile

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -104,27 +104,16 @@ db-up: db-up-dev db-up-test redis-up-dev
104104
db-up-dev:
105105
docker run --name spi_dev -e POSTGRES_DB=spi_dev -e POSTGRES_USER=spi_dev -e POSTGRES_PASSWORD=xxx -p 6432:5432 -d postgres:16-alpine
106106

107-
# Keep test db on postgres:13 for now, to make local testing faster. See
108-
# https://github.com/SwiftPackageIndex/SwiftPackageIndex-Server/issues/3360#issuecomment-2331103211
109-
# for details
110107
db-up-test:
111-
docker run --name spi_test \
112-
-e POSTGRES_DB=spi_test \
113-
-e POSTGRES_USER=spi_test \
114-
-e POSTGRES_PASSWORD=xxx \
115-
-e PGDATA=/pgdata \
116-
--tmpfs /pgdata:rw,noexec,nosuid,size=1024m \
117-
-p 5432:5432 \
118-
-d \
119-
postgres:13-alpine
108+
./scripts/start-test-dbs.sh
120109

121110
db-down: db-down-dev db-down-test redis-down-dev
122111

123112
db-down-dev:
124113
docker rm -f spi_dev
125114

126115
db-down-test:
127-
docker rm -f spi_test
116+
./scripts/stop-test-dbs.sh
128117

129118
db-reset: db-down db-up migrate
130119

scripts/start-test-dbs.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env bash
2+
3+
for port in {6000..6007}; do
4+
docker run --name "spi_test_$port" \
5+
-e POSTGRES_DB=spi_test \
6+
-e POSTGRES_USER=spi_test \
7+
-e POSTGRES_PASSWORD=xxx \
8+
-e PGDATA=/pgdata \
9+
--tmpfs /pgdata:rw,noexec,nosuid,size=1024m \
10+
-p "$port":5432 \
11+
-d \
12+
postgres:16-alpine
13+
done

scripts/stop-test-dbs.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env bash
2+
3+
for c in $(docker ps --format "{{.Names}}" | grep spi_test_); do
4+
docker rm -f "$c"
5+
done

0 commit comments

Comments
 (0)