feat: use dynamically allocated port inside containers (#168)

agneum · agneum · commit 1bf2238b4117 · 2020-09-30T10:33:25.000Z
diff --git a/pkg/services/provision/databases/postgres/postgres.go b/pkg/services/provision/databases/postgres/postgres.go
@@ -8,6 +8,7 @@ package postgres
 import (
 	"database/sql"
 	"fmt"
+	"strconv"
 	"strings"
 	"time"
 
@@ -147,7 +148,7 @@ func getPgConnStr(c *resources.AppConfig) string {
 		sb.WriteString("host=" + c.Host + " ")
 	}
 
-	sb.WriteString("port=5432 ")
+	sb.WriteString("port=" + strconv.Itoa(int(c.Port)) + " ")
 
 	if c.DBName() != "" {
 		sb.WriteString("dbname=" + c.DBName() + " ")
diff --git a/pkg/services/provision/docker/docker.go b/pkg/services/provision/docker/docker.go
@@ -49,16 +49,18 @@ func RunContainer(r runners.Runner, c *resources.AppConfig) (string, error) {
 		return "", errors.Wrap(err, "failed to create socket clone directory")
 	}
 
+	instancePort := strconv.Itoa(int(c.Port))
 	dockerRunCmd := strings.Join([]string{
 		"docker run",
 		"--name", c.CloneName,
 		"--detach",
-		"--publish", strconv.Itoa(int(c.Port)) + ":5432",
+		"--publish", fmt.Sprintf("%[1]s:%[1]s", instancePort),
 		"--env", "PGDATA=" + c.DataDir(),
 		strings.Join(volumes, " "),
 		"--label", labelClone,
 		"--label", c.ClonePool,
 		c.DockerImage,
+		"-p", instancePort,
 		"-k", c.UnixSocketCloneDir,
 	}, " ")
 
