fix(generate_bom): Don't use slim build for Echo. (#2279)

spinnaker · Jan 29, 2018 · 7dddc6b · 7dddc6b
1 parent 546ddd9
commit 7dddc6b
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/dev/generate_bom.py b/dev/generate_bom.py
@@ -150,12 +150,7 @@ def __generate_gcb_config(self, comp):
       config = {
         'images': [versioned_image],
         'steps': [
-          {
-            'args': ['build', '-t', versioned_image, '-f', 'Dockerfile', '.'],
-            'dir': 'spinnaker-monitoring-daemon',
-            'env': env_vars_list,
-            'name':  'gcr.io/cloud-builders/docker'
-          }
+          __format_docker_build_step(versioned_image, env_vars_list, dir='spinnaker-monitoring-daemon')
         ],
         'timeout': '3600s'
       }
@@ -175,6 +170,7 @@ def __generate_gcb_config(self, comp):
       versioned_image = '{reg}/{repo}:{tag}'.format(reg=self.__docker_registry,
                                                     repo=comp,
                                                     tag=gradle_version)
+      slim = comp != 'echo'
       config = {
         'images': [versioned_image],
         'steps': [
@@ -183,16 +179,26 @@ def __generate_gcb_config(self, comp):
             'env': env_vars_list,
             'name':  self.__container_builder_base_image
           },
-          {
-            'args': ['build', '-t', versioned_image, '-f', 'Dockerfile.slim', '.'],
-            'env': env_vars_list,
-            'name':  'gcr.io/cloud-builders/docker'
-          }
+          __format_docker_build_step(versioned_image, env_vars_list, slim=slim)
         ],
         'timeout': '3600s'
       }
     return config
 
+  def __format_docker_build_step(versioned_image, env_vars_list, slim=False, dir=None):
+    """Formats a Docker build step for GCB.
+    """
+    dockerfile = 'Dockerfile.slim' if slim else 'Dockerfile'
+    step = {
+      'args': ['build', '-t', versioned_image, '-f', dockerfile, '.'],
+      'env': env_vars_list,
+      'name':  'gcr.io/cloud-builders/docker'
+    }
+    # Step should only contain a 'dir' key if we're using a non-default dir.
+    if dir:
+      step['dir'] = dir
+    return step
+
   def write_component_version_files(self):
     """Write a file containing the full version for each microservice.
     """