Merge branch '385-clone-lock-file' into 'master'

fix(engine): add socket directory mounts for non-guest virtualization roles (#385)

Closes #385

See merge request postgres-ai/database-lab!557

Author: agneum

engine/internal/provision/docker/docker.go

@@ -49,8 +49,7 @@ func RunContainer(r runners.Runner, c *resources.AppConfig) error {
 		return errors.Wrap(err, "failed to get host info")
 	}
 
-	// Directly mount PGDATA if Database Lab is running without any virtualization.
-	volumes := []string{fmt.Sprintf("--volume %s:%s", c.DataDir(), c.DataDir())}
+	unixSocketCloneDir, volumes := createDefaultVolumes(c)
 
 	if hostInfo.VirtualizationRole == "guest" {
 		// Build custom mounts rely on mounts of the Database Lab instance if it's running inside Docker container.
@@ -61,8 +60,6 @@ func RunContainer(r runners.Runner, c *resources.AppConfig) error {
 		}
 	}
 
-	unixSocketCloneDir := c.Pool.SocketCloneDir(c.CloneName)
-
 	if err := createSocketCloneDir(unixSocketCloneDir); err != nil {
 		return errors.Wrap(err, "failed to create socket clone directory")
 	}
@@ -102,6 +99,18 @@ func RunContainer(r runners.Runner, c *resources.AppConfig) error {
 	return nil
 }
 
+func createDefaultVolumes(c *resources.AppConfig) (string, []string) {
+	unixSocketCloneDir := c.Pool.SocketCloneDir(c.CloneName)
+
+	// Directly mount PGDATA if Database Lab is running without any virtualization.
+	volumes := []string{
+		fmt.Sprintf("--volume %s:%s", c.DataDir(), c.DataDir()),
+		fmt.Sprintf("--volume %s:%s", unixSocketCloneDir, unixSocketCloneDir),
+	}
+
+	return unixSocketCloneDir, volumes
+}
+
 func getMountVolumes(r runners.Runner, c *resources.AppConfig, containerID string) ([]string, error) {
 	inspectCmd := "docker inspect -f '{{ json .Mounts }}' " + containerID
 

engine/internal/provision/docker/docker_test.go

@@ -71,3 +71,26 @@ func TestVolumesBuilding(t *testing.T) {
 		assert.Equal(t, tc.expectedVolumes, volumes)
 	}
 }
+
+func TestDefaultVolumes(t *testing.T) {
+	pool := resources.NewPool("test")
+
+	pool.MountDir = "/tmp/test"
+	pool.PoolDirName = "default"
+	pool.SocketSubDir = "socket"
+
+	appConfig := &resources.AppConfig{
+		Pool: pool,
+	}
+
+	unixSocketCloneDir, volumes := createDefaultVolumes(appConfig)
+
+	assert.NotEmpty(t, unixSocketCloneDir)
+	assert.Equal(t, "/tmp/test/default/socket", unixSocketCloneDir)
+
+	assert.Equal(t, 2, len(volumes))
+
+	assert.ElementsMatch(t, []string{
+		"--volume /tmp/test/default:/tmp/test/default",
+		"--volume /tmp/test/default/socket:/tmp/test/default/socket"}, volumes)
+}