Skip to content

Commit

Permalink
rename dockerfile to integration to avoid confusion (#2225)
Browse files Browse the repository at this point in the history
Signed-off-by: Kristoffer Dalby <[email protected]>
  • Loading branch information
kradalby authored Nov 23, 2024
1 parent f6276ab commit 3a2589f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion integration/auth_oidc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ func (s *AuthOIDCScenario) runMockOIDC(accessTTL time.Duration, users []mockoidc
}

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

Expand Down
17 changes: 9 additions & 8 deletions integration/hsic/hsic.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -303,7 +304,7 @@ func New(
}

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

Expand Down

0 comments on commit 3a2589f

Please sign in to comment.