Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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.11.8.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Usnet Docker Build Ctx and Filepath if `CTF_*_IMAGE` env vars are used
3 changes: 3 additions & 0 deletions framework/components/jd/jd.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,10 @@ func NewWithContext(ctx context.Context, in *Input) (*Output, error) {
defaults(in)
jdImg := os.Getenv("CTF_JD_IMAGE")
if jdImg != "" {
// unset docker build context and file path to avoid conflicts, image provided via env var takes precedence
in.Image = jdImg
in.DockerContext = ""
in.DockerFilePath = ""
}
if in.WSRPCPort == WSRPCHealthPort {
return nil, fmt.Errorf("wsrpc port cannot be the same as wsrpc health port")
Expand Down
3 changes: 3 additions & 0 deletions framework/components/simple_node_set/node_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@ func sharedDBSetup(ctx context.Context, in *Input, bcOut *blockchain.Output) (*O

if envImage != "" {
nodeSpec.Node.Image = envImage
// unset docker build context and file path to avoid conflicts, image provided via env var takes precedence
nodeSpec.Node.DockerContext = ""
nodeSpec.Node.DockerFilePath = ""
}

dbURLHost := strings.Replace(dbOut.Url, "/chainlink?sslmode=disable", fmt.Sprintf("/db_%d?sslmode=disable", i), -1)
Expand Down
Loading