Merge 137f0e3e12 into a7874af3d0

rename dockerfile to integration to avoid confusion
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
2024-11-29 18:33:05 +00:00 · 2024-11-16 12:42:41 +00:00 · 2024-11-04 10:05:21 -06:00
3 changed files with 9 additions and 8 deletions
--- a/Dockerfile.integration
+++ b/Dockerfile.integration
--- a/integration/auth_oidc_test.go
+++ b/integration/auth_oidc_test.go
@ -223,7 +223,7 @@ func (s *AuthOIDCScenario) runMockOIDC(accessTTL time.Duration) (*types.OIDCConf
 	}

 	headscaleBuildOptions := &dockertest.BuildOptions{
-		Dockerfile: "Dockerfile.debug",
+		Dockerfile: hsic.IntegrationTestDockerFileName,
 		ContextDir: dockerContextPath,
 	}

--- a/integration/hsic/hsic.go
+++ b/integration/hsic/hsic.go
@ -41,6 +41,7 @@ const (
 	tlsCertPath                   = "/etc/headscale/tls.cert"
 	tlsKeyPath                    = "/etc/headscale/tls.key"
 	headscaleDefaultPort          = 8080
+	IntegrationTestDockerFileName = "Dockerfile.integration"
 )

 var errHeadscaleStatusCodeNotOk = errors.New("headscale status code not ok")
@ -260,7 +261,7 @@ func New(
 	}

 	headscaleBuildOptions := &dockertest.BuildOptions{
-		Dockerfile: "Dockerfile.debug",
+		Dockerfile: IntegrationTestDockerFileName,
 		ContextDir: dockerContextPath,
 	}
Author	SHA1	Message	Date
Kristoffer Dalby	3697b4d7b6	Merge `137f0e3e12` into `a7874af3d0`	2024-11-16 12:42:41 +00:00
Kristoffer Dalby	137f0e3e12	rename dockerfile to integration to avoid confusion Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>	2024-11-04 10:05:21 -06:00