diff --git a/buildvars/buildvars.go b/buildvars/buildvars.go index fa065995eb0..53bf9e10175 100644 --- a/buildvars/buildvars.go +++ b/buildvars/buildvars.go @@ -74,8 +74,7 @@ type Var struct { // override is set. Mutually exclusive with defaulter: when // defaulter is non-nil, it computes the default and defaultValue // is empty; when defaulter is nil, defaultValue holds the answer - // (possibly the empty string, which is a valid default for vars - // like ComposeBuildDir). + // (the empty string is a valid default). defaultValue string // defaulter, when non-nil, computes the default at Get() time. @@ -202,12 +201,6 @@ var ( // RuntimeTag is the tag for RuntimeImage. RuntimeTag = newVar("RUNTIME_TAG", "24.04") - // ComposeBuildDir holds generated docker-compose overlays produced - // by a compose-rewriting build step. Test harnesses route - // docker-compose invocations through this directory when set. - // Upstream default: empty (no overlay). - ComposeBuildDir = newVar("DGRAPH_COMPOSE_BUILD_DIR", "") - // BuildTags is the space-separated list of Go build tags passed to // `go build` via -tags. The upstream default composes "jemalloc" // (the well-known libjemalloc tag) with any tags a fork adds via @@ -340,7 +333,6 @@ var All = []*Var{ BuildTag, RuntimeImage, RuntimeTag, - ComposeBuildDir, BuildTags, CustomBuildTags, GoRunTags, diff --git a/buildvars/buildvars_test.go b/buildvars/buildvars_test.go index a75bbb78dc0..7a097b1ec80 100644 --- a/buildvars/buildvars_test.go +++ b/buildvars/buildvars_test.go @@ -158,7 +158,6 @@ func TestPackageDefaults(t *testing.T) { {BuildTag, "24.04"}, {RuntimeImage, "ubuntu"}, {RuntimeTag, "24.04"}, - {ComposeBuildDir, ""}, {GoBinDgraphPath, "/gobin/dgraph"}, } for _, c := range cases { diff --git a/t/hooks.go b/t/hooks.go index 7958d519fdc..6b7983e4570 100644 --- a/t/hooks.go +++ b/t/hooks.go @@ -21,12 +21,10 @@ var EnvForCompose = defaultEnvForCompose // unchanged, matching upstream behavior where the pristine compose file // passes straight through. // -// A fork running a compose-file generator may override this to rewrite -// the path to a generated overlay (e.g. under $DGRAPH_COMPOSE_BUILD_DIR) -// and add "--project-directory " so relative bind-mount -// sources resolve against the pristine test package dir rather than the -// overlay output dir. Unknown paths or an empty $DGRAPH_COMPOSE_BUILD_DIR -// fall through to the upstream-compatible "-f " form. +// A fork may override this to layer additional `-f ` files, +// switch the compose-file path, or add `--project-directory ` so +// relative bind-mount sources resolve against the pristine test package +// dir rather than wherever the override emits its base file. var ComposeFileArgs = defaultComposeFileArgs func defaultEnvForCompose() []string { return nil }