Fix dependency detection for latest images

vemukku · Mar 12, 2017 · d4886ad · d4886ad
1 parent 6b03ce5
commit d4886ad
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/bin/webdevops/taskloader/BaseDockerTaskLoader.py b/bin/webdevops/taskloader/BaseDockerTaskLoader.py
@@ -68,17 +68,10 @@ def process_dockerfile_list(self, dockerfile_list):
         Prepare dockerfile list with dependency and also add "auto latest tag" images
         """
 
-        image_list = [x['image']['fullname'] for x in dockerfile_list if x['image']['fullname']]
-
+        # Process auto latest tag
         autoLatestTagImageList = []
-
+        image_list = [x['image']['fullname'] for x in dockerfile_list if x['image']['fullname']]
         for dockerfile in dockerfile_list:
-            # Calculate dependency
-            dockerfile['dependency'] = False
-            if dockerfile['image']['from'] and dockerfile['image']['from'] in image_list:
-                dockerfile['dependency'] = dockerfile['image']['from']
-
-            # Process auto latest tag
             if self.configuration.get('docker.autoLatestTag') and dockerfile['image']['tag'] == self.configuration.get('docker.autoLatestTag'):
                 imageNameLatest = DockerfileUtility.generate_image_name_with_tag_latest(dockerfile['image']['fullname'])
                 if imageNameLatest not in image_list:
@@ -87,10 +80,17 @@ def process_dockerfile_list(self, dockerfile_list):
                     autoLatestTagImage['image']['tag'] = 'latest'
                     autoLatestTagImage['dependency'] = dockerfile['image']['fullname']
                     autoLatestTagImageList.append(autoLatestTagImage)
-
         # Add auto latest tag images to dockerfile list
         dockerfile_list.extend(autoLatestTagImageList)
 
+        # Calculate dependency
+        image_list = [x['image']['fullname'] for x in dockerfile_list if x['image']['fullname']]
+        for dockerfile in dockerfile_list:
+            if not 'dependency' in dockerfile:
+                dockerfile['dependency'] = False
+                if dockerfile['image']['from'] and dockerfile['image']['from'] in image_list:
+                    dockerfile['dependency'] = dockerfile['image']['from']
+
         return dockerfile_list
 
     def generate_task_list(self, dockerfile_list):