restore configurable chaincode base image pull behavior (#5497) (#5498)

(cherry picked from commit f15473c)

Signed-off-by: Drupadh Dinesh <drupadhdinesh@gmail.com>
Co-authored-by: Drupadh Dinesh <81158899+drupadh-dinesh@users.noreply.github.com>

Author: mergify[bot]

core/container/dockercontroller/dockercontroller.go

@@ -117,7 +117,7 @@ func (vm *DockerVM) buildImage(ccid string, reader io.Reader) error {
 	startTime := time.Now()
 	res, err := vm.Client.ImageBuild(context.Background(), reader, dcli.ImageBuildOptions{
 		Tags:        []string{id},
-		PullParent:  true,
+		PullParent:  vm.ChaincodePull,
 		NetworkMode: vm.NetworkMode,
 	})
 

core/container/dockercontroller/dockercontroller_test.go

@@ -410,7 +410,7 @@ func Test_buildImage(t *testing.T) {
 
 	_, in, opts := client.ImageBuildArgsForCall(0)
 	require.Equal(t, "simple-a7a39b72f29718e653e73503210fbb597057b7a1c77d1fe321a1afcff041d4e1", opts.Tags[0])
-	require.True(t, opts.PullParent)
+	require.Equal(t, dvm.ChaincodePull, opts.PullParent)
 	require.Equal(t, "network-mode", opts.NetworkMode)
 	require.Equal(t, &bytes.Buffer{}, in)
 }