From 137f0e3e12c495b0c447f26bf5c2b24da9664328 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Mon, 4 Nov 2024 10:05:21 -0600 Subject: [PATCH] rename dockerfile to integration to avoid confusion Signed-off-by: Kristoffer Dalby --- Dockerfile.debug => Dockerfile.integration | 0 integration/auth_oidc_test.go | 2 +- integration/hsic/hsic.go | 15 ++++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) rename Dockerfile.debug => Dockerfile.integration (100%) 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 6fbdd9e4..cc953b9a 100644 --- 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, } diff --git a/integration/hsic/hsic.go b/integration/hsic/hsic.go index c2ae3336..0df6ebe2 100644 --- a/integration/hsic/hsic.go +++ b/integration/hsic/hsic.go @@ -35,12 +35,13 @@ import ( ) const ( - hsicHashLength = 6 - dockerContextPath = "../." - aclPolicyPath = "/etc/headscale/acl.hujson" - tlsCertPath = "/etc/headscale/tls.cert" - tlsKeyPath = "/etc/headscale/tls.key" - headscaleDefaultPort = 8080 + hsicHashLength = 6 + dockerContextPath = "../." + 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") @@ -260,7 +261,7 @@ func New( } headscaleBuildOptions := &dockertest.BuildOptions{ - Dockerfile: "Dockerfile.debug", + Dockerfile: IntegrationTestDockerFileName, ContextDir: dockerContextPath, }