diff --git a/framework/.changeset/v0.11.8.md b/framework/.changeset/v0.11.8.md new file mode 100644 index 000000000..49244be8b --- /dev/null +++ b/framework/.changeset/v0.11.8.md @@ -0,0 +1 @@ +- Usnet Docker Build Ctx and Filepath if `CTF_*_IMAGE` env vars are used \ No newline at end of file diff --git a/framework/components/jd/jd.go b/framework/components/jd/jd.go index 9e259f396..01f23029b 100644 --- a/framework/components/jd/jd.go +++ b/framework/components/jd/jd.go @@ -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") diff --git a/framework/components/simple_node_set/node_set.go b/framework/components/simple_node_set/node_set.go index 06a29e97e..38f594700 100644 --- a/framework/components/simple_node_set/node_set.go +++ b/framework/components/simple_node_set/node_set.go @@ -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)