Skip to content

Add build args support to CTF #2175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 3, 2025
Merged

Add build args support to CTF #2175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions framework/.changeset/v0.10.33
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Support passing buildArgs to docker when building images
3 changes: 2 additions & 1 deletion framework/components/clnode/clnode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ type NodeInput struct {
Name string `toml:"name"`
DockerFilePath string `toml:"docker_file"`
DockerContext string `toml:"docker_ctx"`
DockerBuildArgs map[string]string `toml:"docker_build_args"`
PullImage bool `toml:"pull_image"`
CapabilitiesBinaryPaths []string `toml:"capabilities"`
CapabilityContainerDir string `toml:"capabilities_container_dir"`
Expand Down Expand Up @@ -340,7 +341,7 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
}
if req.Image == "" {
req.Image = TmpImageName
if err := framework.BuildImageOnce(once, in.Node.DockerContext, in.Node.DockerFilePath, req.Image); err != nil {
if err := framework.BuildImageOnce(once, in.Node.DockerContext, in.Node.DockerFilePath, req.Image, nil); err != nil {
return nil, err
}
req.KeepImage = false
Expand Down
2 changes: 1 addition & 1 deletion framework/components/jd/jd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ func NewJD(in *Input) (*Output, error) {
}
if req.Image == "" {
req.Image = TmpImageName
if err := framework.BuildImage(in.DockerContext, in.DockerFilePath, req.Image); err != nil {
if err := framework.BuildImage(in.DockerContext, in.DockerFilePath, req.Image, nil); err != nil {
return nil, err
}
req.KeepImage = false
Expand Down
1 change: 1 addition & 0 deletions framework/components/simple_node_set/node_set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ func sharedDBSetup(in *Input, bcOut *blockchain.Output) (*Output, error) {
PullImage: in.NodeSpecs[overrideIdx].Node.PullImage,
DockerFilePath: in.NodeSpecs[overrideIdx].Node.DockerFilePath,
DockerContext: in.NodeSpecs[overrideIdx].Node.DockerContext,
DockerBuildArgs: in.NodeSpecs[overrideIdx].Node.DockerBuildArgs,
CapabilitiesBinaryPaths: in.NodeSpecs[overrideIdx].Node.CapabilitiesBinaryPaths,
CapabilityContainerDir: in.NodeSpecs[overrideIdx].Node.CapabilityContainerDir,
TestConfigOverrides: net,
Expand Down
20 changes: 15 additions & 5 deletions framework/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,23 +346,33 @@ func SaveContainerLogs(dir string) ([]string, error) {
return logFilePaths, nil
}

func BuildImageOnce(once *sync.Once, dctx, dfile, nameAndTag string) error {
func BuildImageOnce(once *sync.Once, dctx, dfile, nameAndTag string, buildArgs map[string]string) error {
var err error
once.Do(func() {
err = BuildImage(dctx, dfile, nameAndTag)
err = BuildImage(dctx, dfile, nameAndTag, buildArgs)
if err != nil {
err = fmt.Errorf("failed to build Docker image: %w", err)
}
})
return err
}

func BuildImage(dctx, dfile, nameAndTag string) error {
func BuildImage(dctx, dfile, nameAndTag string, buildArgs map[string]string) error {
dfilePath := filepath.Join(dctx, dfile)
if os.Getenv("CTF_CLNODE_DLV") == "true" {
return RunCommand("docker", "build", "--build-arg", `GO_GCFLAGS=all=-N -l`, "--build-arg", "CHAINLINK_USER=chainlink", "--build-arg", "CL_INSTALL_PRIVATE_PLUGINS=false", "-t", nameAndTag, "-f", dfilePath, dctx)
commandParts := []string{"docker", "build", "--build-arg", `GO_GCFLAGS=all=-N -l`, "--build-arg", "CHAINLINK_USER=chainlink", "--build-arg", "CL_INSTALL_PRIVATE_PLUGINS=false"}
for k, v := range buildArgs {
commandParts = append(commandParts, "--build-arg", fmt.Sprintf("%s=%s", k, v))
}
commandParts = append(commandParts, "-t", nameAndTag, "-f", dfilePath, dctx)
return RunCommand(commandParts[0], commandParts[1:]...)
}
commandParts := []string{"docker", "build", "--build-arg", "CHAINLINK_USER=chainlink", "--build-arg", "CL_INSTALL_PRIVATE_PLUGINS=false"}
for k, v := range buildArgs {
commandParts = append(commandParts, "--build-arg", fmt.Sprintf("%s=%s", k, v))
}
return RunCommand("docker", "build", "--build-arg", "CHAINLINK_USER=chainlink", "--build-arg", "CL_INSTALL_PRIVATE_PLUGINS=false", "-t", nameAndTag, "-f", dfilePath, dctx)
commandParts = append(commandParts, "-t", nameAndTag, "-f", dfilePath, dctx)
return RunCommand(commandParts[0], commandParts[1:]...)
}

// RemoveTestContainers removes all test containers, volumes and CTF docker network
Expand Down
Loading