Fix DERP name in integration tests

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>

integration_common_test.go

@@ -19,7 +19,7 @@ import (
 )
 
 const (
-	headscaleHostname      = "headscale-derp"
+	headscaleHostname      = "headscale"
 	DOCKER_EXECUTE_TIMEOUT = 10 * time.Second
 )
 

integration_embedded_derp_test.go

@@ -27,6 +27,7 @@ import (
 )
 
 const (
+	headscaleDerpHostname = "headscale-derp"
 	namespaceName   = "derpnamespace"
 	totalContainers = 3
 )
@@ -112,7 +113,7 @@ func (s *IntegrationDERPTestSuite) SetupSuite() {
 	}
 
 	headscaleOptions := &dockertest.RunOptions{
-		Name: headscaleHostname,
+		Name: headscaleDerpHostname,
 		Mounts: []string{
 			fmt.Sprintf(
 				"%s/integration_test/etc_embedded_derp:/etc/headscale",
@@ -127,7 +128,7 @@ func (s *IntegrationDERPTestSuite) SetupSuite() {
 		},
 	}
 
-	err = s.pool.RemoveContainerByName(headscaleHostname)
+	err = s.pool.RemoveContainerByName(headscaleDerpHostname)
 	if err != nil {
 		s.FailNow(
 			fmt.Sprintf(

integration_general_test.go

@@ -236,7 +236,7 @@ func (s *IntegrationTestSuite) SetupSuite() {
 	}
 
 	headscaleOptions := &dockertest.RunOptions{
-		Name: "headscale",
+		Name: headscaleHostname,
 		Mounts: []string{
 			fmt.Sprintf("%s/integration_test/etc:/etc/headscale", currentPath),
 		},