[FAB-4829] Error when trying to instantiate

When trying to instantiate chaincode, there is an
error. The extra docker images for the chaincode
need to be cleaned up at the end of each test
run.

I've also removed printing the env vars after
each run.

Change-Id: If5eccf2f1eeb88a7144377b9491871399686d692
Signed-off-by: Latitia M Haskins <[email protected]>

Author: lhaskins

test/feature/steps/compose_util.py

@@ -167,7 +167,6 @@ def issueCommand(self, command, components=[]):
                     raise Exception(_error)
         except:
             err = "Error occurred {0}: {1}".format(cmd, sys.exc_info()[1])
-            #print(err)
             output = err
 
         # Don't rebuild if ps command
@@ -204,12 +203,14 @@ def decompose(self):
         self.issueCommand(["rm", "-f"])
         env = self.getEnv()
 
-        print("Current env:", env)
-
         # Now remove associated chaincode containers if any
         cmd = ["docker", "ps", "-qa", "--filter", "name={0}".format(self.projectName)]
         output = str(subprocess.check_output(cmd, env=env))
         container_list = output.strip().split('\n')
         for container in container_list:
             if container != '':
                 subprocess.call(['docker', 'rm', '-f', container], env=env)
+
+        # Need to remove the chaincode images: docker rmi -f $(docker images | grep "example.com-" | awk '{print $3}')
+        cmd = ['docker images | grep ".example.com-" | awk \'{print $3}\' | xargs docker rmi']
+        subprocess.call(cmd, shell=True, env=env)