From f86c6189c21b46df4595931d0f3c863e1492b5cf Mon Sep 17 00:00:00 2001
From: Elio Bischof <eliobischof@gmail.com>
Date: Mon, 25 Jul 2022 17:10:52 +0200
Subject: [PATCH] derive e2e orgs domain from baseurl

---
 cmd/e2e-setup/execute.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cmd/e2e-setup/execute.go b/cmd/e2e-setup/execute.go
index 2127ed11f37..6d2eb5c05a5 100644
--- a/cmd/e2e-setup/execute.go
+++ b/cmd/e2e-setup/execute.go
@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"io/ioutil"
+	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
@@ -22,9 +23,14 @@ func execute(ctx context.Context, cmd *command.Commands, cfg E2EConfig, users []
 
 	orgOwner := newHuman(users[0])
 
+	baseUrl, err := url.Parse(cfg.BaseURL)
+	if err != nil {
+		return err
+	}
+
 	orgOwnerID, org, err := cmd.SetUpOrg(ctx, &command.OrgSetup{
 		Name:         cfg.Org,
-		CustomDomain: "localhost",
+		CustomDomain: baseUrl.Host,
 		Human:        *orgOwner,
 	})
 	if err != nil {