Skip to content

Commit 3a2589f

Browse files
authored
rename dockerfile to integration to avoid confusion (#2225)
Signed-off-by: Kristoffer Dalby <[email protected]>
1 parent f6276ab commit 3a2589f

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed
File renamed without changes.

integration/auth_oidc_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ func (s *AuthOIDCScenario) runMockOIDC(accessTTL time.Duration, users []mockoidc
601601
}
602602

603603
headscaleBuildOptions := &dockertest.BuildOptions{
604-
Dockerfile: "Dockerfile.debug",
604+
Dockerfile: hsic.IntegrationTestDockerFileName,
605605
ContextDir: dockerContextPath,
606606
}
607607

integration/hsic/hsic.go

+9-8
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@ import (
3030
)
3131

3232
const (
33-
hsicHashLength = 6
34-
dockerContextPath = "../."
35-
caCertRoot = "/usr/local/share/ca-certificates"
36-
aclPolicyPath = "/etc/headscale/acl.hujson"
37-
tlsCertPath = "/etc/headscale/tls.cert"
38-
tlsKeyPath = "/etc/headscale/tls.key"
39-
headscaleDefaultPort = 8080
33+
hsicHashLength = 6
34+
dockerContextPath = "../."
35+
caCertRoot = "/usr/local/share/ca-certificates"
36+
aclPolicyPath = "/etc/headscale/acl.hujson"
37+
tlsCertPath = "/etc/headscale/tls.cert"
38+
tlsKeyPath = "/etc/headscale/tls.key"
39+
headscaleDefaultPort = 8080
40+
IntegrationTestDockerFileName = "Dockerfile.integration"
4041
)
4142

4243
var errHeadscaleStatusCodeNotOk = errors.New("headscale status code not ok")
@@ -303,7 +304,7 @@ func New(
303304
}
304305

305306
headscaleBuildOptions := &dockertest.BuildOptions{
306-
Dockerfile: "Dockerfile.debug",
307+
Dockerfile: IntegrationTestDockerFileName,
307308
ContextDir: dockerContextPath,
308309
}
309310

0 commit comments

Comments
 (0)