Merge branch 'main' into peerdebug

kylecarbs · web-flow · commit 595050f4b319 · 2022-01-29T19:20:55.000-06:00
diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml
@@ -159,7 +159,7 @@ jobs:
         run:
           DB=true gotestsum --jsonfile="gotests.json" --packages="./..." --
           -covermode=atomic -coverprofile="gotests.coverage" -timeout=3m
-          -count=1 -race -parallel=1
+          -count=1 -race -parallel=2
 
       - uses: codecov/codecov-action@v2
         with:
diff --git a/database/postgres/postgres.go b/database/postgres/postgres.go
@@ -3,6 +3,8 @@ package postgres
 import (
 	"database/sql"
 	"fmt"
+	"io/ioutil"
+	"os"
 	"time"
 
 	"github.com/ory/dockertest/v3"
@@ -16,15 +18,29 @@ func Open() (string, func(), error) {
 	if err != nil {
 		return "", nil, xerrors.Errorf("create pool: %w", err)
 	}
+	tempDir, err := ioutil.TempDir(os.TempDir(), "postgres")
+	if err != nil {
+		return "", nil, xerrors.Errorf("create tempdir: %w", err)
+	}
 	resource, err := pool.RunWithOptions(&dockertest.RunOptions{
 		Repository: "postgres",
 		Tag:        "11",
 		Env: []string{
 			"POSTGRES_PASSWORD=postgres",
 			"POSTGRES_USER=postgres",
 			"POSTGRES_DB=postgres",
+			// The location for temporary database files!
+			"PGDATA=/tmp",
 			"listen_addresses = '*'",
 		},
+		Mounts: []string{
+			// The postgres image has a VOLUME parameter in it's image.
+			// If we don't mount at this point, Docker will allocate a
+			// volume for this directory.
+			//
+			// This isn't used anyways, since we override PGDATA.
+			fmt.Sprintf("%s:/var/lib/postgresql/data", tempDir),
+		},
 	}, func(config *docker.HostConfig) {
 		// set AutoRemove to true so that stopped container goes away by itself
 		config.AutoRemove = true
@@ -57,5 +73,6 @@ func Open() (string, func(), error) {
 	}
 	return dbURL, func() {
 		_ = pool.Purge(resource)
+		_ = os.RemoveAll(tempDir)
 	}, nil
 }
