Skip to content

Commit

Permalink
rename dockerfile to integration to avoid confusion
Browse files Browse the repository at this point in the history
Signed-off-by: Kristoffer Dalby <[email protected]>
  • Loading branch information
kradalby committed Nov 4, 2024
1 parent 0c98d09 commit 137f0e3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 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 @@ -223,7 +223,7 @@ func (s *AuthOIDCScenario) runMockOIDC(accessTTL time.Duration) (*types.OIDCConf
}

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

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

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

Expand Down

0 comments on commit 137f0e3

Please sign in to comment.