@automattic/vip 3.1.0 → 3.1.1-dev.1

package/dist/bin/vip-dev-env-start.js

@@ -31,11 +31,11 @@ const examples = [{
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
   await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
   const startProcessing = new Date();
-  const versions = await lando.engine.daemon.getVersions();
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   trackingInfo.vscode = Boolean(opt.vscode);
-  trackingInfo.docker = versions.engine;
-  trackingInfo.docker_compose = versions.compose;
+  trackingInfo.docker = lando.config.versions.engine;
+  trackingInfo.docker_compose = lando.config.versions.compose;
+  trackingInfo.compose_plugin = lando.config.versions.composePlugin;
   await (0, _tracker.trackEvent)('dev_env_start_command_execute', trackingInfo);
   debug('Args: ', arg, 'Options: ', opt);
   const options = {

package/dist/lib/dev-environment/dev-environment-cli.js

@@ -126,7 +126,6 @@ const verifyDNSResolution = async slug => {
 const validateDependencies = async (lando, slug) => {
   const now = new Date();
   (0, _devEnvironmentLando.validateDockerInstalled)(lando);
-  await (0, _devEnvironmentLando.validateDockerAccess)(lando);
   if (slug) {
     await verifyDNSResolution(slug);
   }

package/dist/lib/dev-environment/dev-environment-lando.js

@@ -12,7 +12,6 @@ exports.landoRebuild = landoRebuild;
 exports.landoShell = landoShell;
 exports.landoStart = landoStart;
 exports.landoStop = landoStop;
-exports.validateDockerAccess = validateDockerAccess;
 exports.validateDockerInstalled = validateDockerInstalled;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _debug = _interopRequireDefault(require("debug"));
@@ -24,6 +23,7 @@ var _promises = require("node:dns/promises");
 var _promises2 = require("node:fs/promises");
 var _nodeOs = require("node:os");
 var _nodePath = _interopRequireWildcard(require("node:path"));
+var _semver = require("semver");
 var _xdgBasedir = _interopRequireDefault(require("xdg-basedir"));
 var _devEnvironmentCore = require("./dev-environment-core");
 var _dockerUtils = require("./docker-utils");
@@ -180,11 +180,13 @@ async function bootstrapLando() {
         registryResolvable = false;
       }
       const pull = registryResolvable && (instanceData.pullAfter ?? 0) < Date.now();
+      console.log(pull);
       if (Array.isArray(data.opts.pullable) && Array.isArray(data.opts.local) && data.opts.local.length === 0 && !pull) {
         // Setting `data.opts.pullable` to an empty array prevents Lando from pulling images with `docker pull`.
         // Note that if some of the images are not available, they will still be pulled by `docker-compose`.
         data.opts.local = data.opts.pullable;
         data.opts.pullable = [];
+        console.log(data.opts);
       }
       if (pull || !instanceData.pullAfter) {
         instanceData.pullAfter = Date.now() + 7 * 24 * 60 * 60 * 1000;
@@ -534,21 +536,26 @@ async function ensureNoOrphantProxyContainer(lando) {
   await proxyContainer.remove();
 }
 function validateDockerInstalled(lando) {
-  lando.log.verbose('docker-engine exists: %s', lando.engine.dockerInstalled);
-  if (!lando.engine.dockerInstalled) {
-    throw new _userError.default('docker could not be located! Please follow the following instructions to install it - https://docs.docker.com/engine/install/');
-  }
-  lando.log.verbose('docker-compose exists: %s', lando.engine.composeInstalled);
-  if (!lando.engine.composeInstalled) {
-    throw Error('docker-compose could not be located! Please follow the following instructions to install it - https://docs.docker.com/compose/install/');
-  }
-}
-async function validateDockerAccess(lando) {
-  const docker = lando.engine.docker;
-  lando.log.verbose('Fetching docker info to verify Docker connection');
-  try {
-    await docker.info();
-  } catch (error) {
+  const {
+    engine,
+    composePlugin,
+    compose
+  } = lando.config.versions;
+  lando.log.verbose('docker-engine version: %s', engine);
+  if (!engine) {
+    if (!lando.config.dockerBin) {
+      throw new _userError.default('docker binary could not be located! Please follow the following instructions to install it - https://docs.docker.com/engine/install/');
+    }
     throw new _userError.default('Failed to connect to Docker. Please verify that Docker engine (service) is running and follow the troubleshooting instructions for your platform.');
   }
+  lando.log.verbose('docker-compose version: %s', compose);
+  lando.log.verbose('compose plugin version: %s', composePlugin);
+  if (!composePlugin) {
+    if (!compose) {
+      throw new Error('docker-compose binary could not be located! Please follow the following instructions to install it - https://docs.docker.com/compose/install/');
+    }
+    if (!(0, _semver.satisfies)(compose, '^2.0.0')) {
+      throw new Error(`docker-compose version ${compose} is not supported. Please upgrade to version 2.0.0 or higher - https://docs.docker.com/compose/install/`);
+    }
+  }
 }

package/docs/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Changelog
 
+### 3.1.0
+
+* Integrate Media Import v2 flow and expand on media import error report messaging
+
+**Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.0.0...3.1.0
+
 ### 3.0.0
 
 * fix(dev-env): demo code is displayed as `[demo-image]`
@@ -11,7 +17,6 @@
 * ci: add publish prerelease workflow
 * build(deps): bump step-security/harden-runner from 2.7.1 to 2.8.0
 * build(deps): bump ini from 4.1.2 to 4.1.3
-* Integrate media import v2 flow and expand on media import error report messaging
 
 **Full Changelog**: https://github.com/Automattic/vip-cli/compare/2.39.7...3.0.0