feat: up --build support

orisano · orisano · commit aac7193b0cf0 · 2019-08-22T22:05:16.000+09:00
diff --git a/compose/cli/main.py b/compose/cli/main.py
@@ -275,9 +275,6 @@ def build(self, options):
         """
         service_names = options['SERVICE']
         build_args = options.get('--build-arg', None)
-        environment_file = options.get('--env-file')
-        environment = Environment.from_env_file(self.project_dir, environment_file)
-        native_builder = environment.get_boolean('COMPOSE_NATIVE_BUILDER')
         if build_args:
             if not service_names and docker.utils.version_lt(self.project.client.api_version, '1.25'):
                 raise UserError(
@@ -286,6 +283,8 @@ def build(self, options):
                 )
             build_args = resolve_build_args(build_args, self.toplevel_environment)
 
+        native_builder = self.toplevel_environment.get_boolean('COMPOSE_NATIVE_BUILDER')
+
         self.project.build(
             service_names=options['SERVICE'],
             no_cache=bool(options.get('--no-cache', False)),
@@ -1075,6 +1074,8 @@ def up(self, options):
         for excluded in [x for x in opts if options.get(x) and no_start]:
             raise UserError('--no-start and {} cannot be combined.'.format(excluded))
 
+        native_builder = self.toplevel_environment.get_boolean('COMPOSE_NATIVE_BUILDER')
+
         with up_shutdown_context(self.project, service_names, timeout, detached):
             warn_for_swarm_mode(self.project.client)
 
@@ -1094,6 +1095,7 @@ def up(rebuild):
                     reset_container_image=rebuild,
                     renew_anonymous_volumes=options.get('--renew-anon-volumes'),
                     silent=options.get('--quiet-pull'),
+                    cli=native_builder,
                 )
 
             try:
diff --git a/compose/project.py b/compose/project.py
@@ -509,6 +509,7 @@ def up(self,
            reset_container_image=False,
            renew_anonymous_volumes=False,
            silent=False,
+           cli=False,
            ):
 
         self.initialize()
@@ -523,7 +524,7 @@ def up(self,
             include_deps=start_deps)
 
         for svc in services:
-            svc.ensure_image_exists(do_build=do_build, silent=silent)
+            svc.ensure_image_exists(do_build=do_build, silent=silent, cli=cli)
         plans = self._get_convergence_plans(
             services, strategy, always_recreate_deps=always_recreate_deps)
 
diff --git a/compose/service.py b/compose/service.py
@@ -341,9 +341,9 @@ def create_container(self,
             raise OperationFailedError("Cannot create container for service %s: %s" %
                                        (self.name, ex.explanation))
 
-    def ensure_image_exists(self, do_build=BuildAction.none, silent=False):
+    def ensure_image_exists(self, do_build=BuildAction.none, silent=False, cli=False):
         if self.can_be_built() and do_build == BuildAction.force:
-            self.build()
+            self.build(cli=cli)
             return
 
         try:
@@ -359,7 +359,7 @@ def ensure_image_exists(self, do_build=BuildAction.none, silent=False):
         if do_build == BuildAction.skip:
             raise NeedsBuildError(self)
 
-        self.build()
+        self.build(cli=cli)
         log.warning(
             "Image for service {} was built because it did not already exist. To "
             "rebuild this image you must use `docker-compose build` or "
