run DC build with an optional --pull (lando#31)

codebymikey · Mar 1, 2023 · bc89b23 · bc89b23
1 parent 86a9726
commit bc89b23
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/lib/compose.js b/lib/compose.js
@@ -77,7 +77,7 @@ const buildShell = (run, name, compose, opts = {}) => ({
  * Run docker compose build
  */
 exports.build = (compose, project, opts = {}) => {
-  return buildShell('build', project, compose, {pull: _.isEmpty(opts.local)});
+  return buildShell('build', project, compose, {pull: _.isEmpty(opts.pullable) || _.isEmpty(opts.local)});
 };
 
 /*

diff --git a/lib/router.js b/lib/router.js
@@ -30,10 +30,8 @@ exports.eventWrapper = (name, daemon, events, data, run) => daemon.up()
  * Helper to route to build command
  */
 exports.build = (data, compose) => {
-  // Pull
-  return retryEach(data, datum => compose('pull', datum))
-  // then build
-  .then(() => retryEach(data, datum => compose('build', datum)));
+  // Build (with optional "--pull")
+  return retryEach(data, datum => compose('build', datum));
 };
 
 /*