Skip to content

Commit d5ea939

Browse files
committed
try skip pulling image
1 parent 45cc193 commit d5ea939

File tree

3 files changed

+29
-44
lines changed

3 files changed

+29
-44
lines changed

framework/cmd/interactive.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,10 @@ func createComponentsFromForm(form *nodeSetForm) error {
3636
case "anvil":
3737
f := func() {
3838
bc, err = blockchain.NewBlockchainNetwork(&blockchain.Input{
39-
Type: "anvil",
40-
Image: "f4hrenh9it/foundry",
41-
PullImage: true,
42-
Port: "8545",
43-
ChainID: "31337",
39+
Type: "anvil",
40+
Image: "f4hrenh9it/foundry",
41+
Port: "8545",
42+
ChainID: "31337",
4443
})
4544
}
4645
err = spinner.New().
@@ -54,12 +53,10 @@ func createComponentsFromForm(form *nodeSetForm) error {
5453
for i := 0; i < form.Nodes; i++ {
5554
nspecs = append(nspecs, &clnode.Input{
5655
DbInput: &postgres.Input{
57-
Image: "postgres:15.6",
58-
PullImage: true,
56+
Image: "postgres:15.6",
5957
},
6058
Node: &clnode.NodeInput{
61-
Image: form.CLVersion,
62-
PullImage: true,
59+
Image: form.CLVersion,
6360
},
6461
})
6562
}

framework/components/clnode/clnode_test.go

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,11 @@ func TestDockerNodeWithSharedDB(t *testing.T) {
3333
input: &clnode.Input{
3434
DataProviderURL: "http://example.com",
3535
DbInput: &postgres.Input{
36-
Image: "postgres:15.6",
37-
PullImage: true,
36+
Image: "postgres:15.6",
3837
},
3938
Node: &clnode.NodeInput{
40-
Image: "public.ecr.aws/chainlink/chainlink:v2.17.0",
41-
Name: "cl-node-1",
42-
PullImage: true,
39+
Image: "public.ecr.aws/chainlink/chainlink:v2.17.0",
40+
Name: "cl-node-1",
4341
},
4442
},
4543
assertion: func(t *testing.T, output *clnode.Output) {
@@ -69,13 +67,11 @@ func TestDockerNodeWithDB(t *testing.T) {
6967
input: &clnode.Input{
7068
DataProviderURL: "http://example.com",
7169
DbInput: &postgres.Input{
72-
Image: "postgres:15.6",
73-
PullImage: true,
70+
Image: "postgres:15.6",
7471
},
7572
Node: &clnode.NodeInput{
76-
Image: "public.ecr.aws/chainlink/chainlink:v2.17.0",
77-
Name: "cl-node-2",
78-
PullImage: true,
73+
Image: "public.ecr.aws/chainlink/chainlink:v2.17.0",
74+
Name: "cl-node-2",
7975
},
8076
},
8177
assertion: func(t *testing.T, output *clnode.Output) {

framework/components/simple_node_set/nodeset_test.go

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,10 @@ func TestDockerNodeSetSharedDB(t *testing.T) {
4343
name: "2 nodes cluster, override mode 'all'",
4444
fakeURL: "http://example.com",
4545
bcInput: &blockchain.Input{
46-
Type: "anvil",
47-
Image: "f4hrenh9it/foundry",
48-
PullImage: true,
49-
Port: "8545",
50-
ChainID: "31337",
46+
Type: "anvil",
47+
Image: "f4hrenh9it/foundry",
48+
Port: "8545",
49+
ChainID: "31337",
5150
},
5251
nodeSetInput: &ns.Input{
5352
Nodes: 2,
@@ -56,13 +55,11 @@ func TestDockerNodeSetSharedDB(t *testing.T) {
5655
{
5756
DataProviderURL: "http://example.com",
5857
DbInput: &postgres.Input{
59-
Image: "postgres:15.6",
60-
PullImage: true,
58+
Image: "postgres:15.6",
6159
},
6260
Node: &clnode.NodeInput{
63-
Image: "public.ecr.aws/chainlink/chainlink:v2.17.0",
64-
Name: "cl-node",
65-
PullImage: true,
61+
Image: "public.ecr.aws/chainlink/chainlink:v2.17.0",
62+
Name: "cl-node",
6663
},
6764
},
6865
},
@@ -75,11 +72,10 @@ func TestDockerNodeSetSharedDB(t *testing.T) {
7572
name: "2 nodes cluster, override mode 'each'",
7673
fakeURL: "http://example.com",
7774
bcInput: &blockchain.Input{
78-
Type: "anvil",
79-
Image: "f4hrenh9it/foundry",
80-
PullImage: true,
81-
Port: "8546",
82-
ChainID: "31337",
75+
Type: "anvil",
76+
Image: "f4hrenh9it/foundry",
77+
Port: "8546",
78+
ChainID: "31337",
8379
},
8480
nodeSetInput: &ns.Input{
8581
Nodes: 2,
@@ -88,13 +84,11 @@ func TestDockerNodeSetSharedDB(t *testing.T) {
8884
{
8985
DataProviderURL: "http://example.com",
9086
DbInput: &postgres.Input{
91-
Image: "postgres:15.6",
92-
PullImage: true,
87+
Image: "postgres:15.6",
9388
},
9489
Node: &clnode.NodeInput{
95-
Image: "public.ecr.aws/chainlink/chainlink:v2.17.0",
96-
Name: "cl-node-1",
97-
PullImage: true,
90+
Image: "public.ecr.aws/chainlink/chainlink:v2.17.0",
91+
Name: "cl-node-1",
9892
UserConfigOverrides: `
9993
[Log]
10094
level = 'info'
@@ -104,13 +98,11 @@ level = 'info'
10498
{
10599
DataProviderURL: "http://example.com",
106100
DbInput: &postgres.Input{
107-
Image: "postgres:15.6",
108-
PullImage: true,
101+
Image: "postgres:15.6",
109102
},
110103
Node: &clnode.NodeInput{
111-
Image: "public.ecr.aws/chainlink/chainlink:v2.17.0",
112-
Name: "cl-node-2",
113-
PullImage: true,
104+
Image: "public.ecr.aws/chainlink/chainlink:v2.17.0",
105+
Name: "cl-node-2",
114106
UserConfigOverrides: `
115107
[Log]
116108
level = 'info'

0 commit comments

Comments
 (0)