From c90d0dd843e47cbbe5584725ff8c2b2387dd0b90 Mon Sep 17 00:00:00 2001
From: Kristoffer Dalby <kristoffer@tailscale.com>
Date: Tue, 18 Oct 2022 11:58:15 +0200
Subject: [PATCH] remove the need to bind host port

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
---
 integration/hsic/hsic.go | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/integration/hsic/hsic.go b/integration/hsic/hsic.go
index 78b1ef3b..2b1eedc8 100644
--- a/integration/hsic/hsic.go
+++ b/integration/hsic/hsic.go
@@ -13,7 +13,6 @@ import (
 	v1 "github.com/juanfont/headscale/gen/go/headscale/v1"
 	"github.com/juanfont/headscale/integration/dockertestutil"
 	"github.com/ory/dockertest/v3"
-	"github.com/ory/dockertest/v3/docker"
 )
 
 const hsicHashLength = 6
@@ -46,7 +45,6 @@ func New(
 
 	hostname := fmt.Sprintf("hs-%s", hash)
 	portProto := fmt.Sprintf("%d/tcp", port)
-	dockerPort := docker.Port(portProto)
 
 	currentPath, err := os.Getwd()
 	if err != nil {
@@ -64,9 +62,6 @@ func New(
 		},
 		ExposedPorts: []string{portProto},
 		// TODO(kradalby): WHY do we need to bind these now that we run fully in docker?
-		PortBindings: map[docker.Port][]docker.PortBinding{
-			dockerPort: {{HostPort: fmt.Sprintf("%d", port)}},
-		},
 		Networks: []*dockertest.Network{network},
 		Cmd:      []string{"headscale", "serve"},
 	}
@@ -116,17 +111,17 @@ func (t *HeadscaleInContainer) GetPort() string {
 }
 
 func (t *HeadscaleInContainer) GetHealthEndpoint() string {
-	hostEndpoint := fmt.Sprintf("%s:%s",
+	hostEndpoint := fmt.Sprintf("%s:%d",
 		t.GetIP(),
-		t.GetPort())
+		t.port)
 
 	return fmt.Sprintf("http://%s/health", hostEndpoint)
 }
 
 func (t *HeadscaleInContainer) GetEndpoint() string {
-	hostEndpoint := fmt.Sprintf("%s:%s",
+	hostEndpoint := fmt.Sprintf("%s:%d",
 		t.GetIP(),
-		t.GetPort())
+		t.port)
 
 	return fmt.Sprintf("http://%s", hostEndpoint)
 }
@@ -134,6 +129,8 @@ func (t *HeadscaleInContainer) GetEndpoint() string {
 func (t *HeadscaleInContainer) WaitForReady() error {
 	url := t.GetHealthEndpoint()
 
+	log.Printf("waiting for headscale to be ready at %s", url)
+
 	return t.pool.Retry(func() error {
 		resp, err := http.Get(url)
 		if err != nil {