diff --git a/Dockerfile.debug b/Dockerfile.integration similarity index 100% rename from Dockerfile.debug rename to Dockerfile.integration diff --git a/integration/auth_oidc_test.go b/integration/auth_oidc_test.go index 2fbfb555..e0a61401 100644 --- a/integration/auth_oidc_test.go +++ b/integration/auth_oidc_test.go @@ -601,7 +601,7 @@ func (s *AuthOIDCScenario) runMockOIDC(accessTTL time.Duration, users []mockoidc } headscaleBuildOptions := &dockertest.BuildOptions{ - Dockerfile: "Dockerfile.debug", + Dockerfile: hsic.IntegrationTestDockerFileName, ContextDir: dockerContextPath, } diff --git a/integration/hsic/hsic.go b/integration/hsic/hsic.go index 8c379dc8..cd725f31 100644 --- a/integration/hsic/hsic.go +++ b/integration/hsic/hsic.go @@ -30,13 +30,14 @@ import ( ) const ( - hsicHashLength = 6 - dockerContextPath = "../." - caCertRoot = "/usr/local/share/ca-certificates" - aclPolicyPath = "/etc/headscale/acl.hujson" - tlsCertPath = "/etc/headscale/tls.cert" - tlsKeyPath = "/etc/headscale/tls.key" - headscaleDefaultPort = 8080 + hsicHashLength = 6 + dockerContextPath = "../." + caCertRoot = "/usr/local/share/ca-certificates" + aclPolicyPath = "/etc/headscale/acl.hujson" + tlsCertPath = "/etc/headscale/tls.cert" + tlsKeyPath = "/etc/headscale/tls.key" + headscaleDefaultPort = 8080 + IntegrationTestDockerFileName = "Dockerfile.integration" ) var errHeadscaleStatusCodeNotOk = errors.New("headscale status code not ok") @@ -303,7 +304,7 @@ func New( } headscaleBuildOptions := &dockertest.BuildOptions{ - Dockerfile: "Dockerfile.debug", + Dockerfile: IntegrationTestDockerFileName, ContextDir: dockerContextPath, }