From c042d11cec288946d4cad56cb7ff9e7889b8cfe7 Mon Sep 17 00:00:00 2001 From: Gilbert Holland-Lloyd Date: Thu, 13 Jun 2024 14:43:48 +0100 Subject: [PATCH] Update more exec commands --- packages/navy/src/config-providers/filesystem/index.js | 2 +- packages/navy/src/http-proxy.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/navy/src/config-providers/filesystem/index.js b/packages/navy/src/config-providers/filesystem/index.js index deb1ac4..0aae54f 100644 --- a/packages/navy/src/config-providers/filesystem/index.js +++ b/packages/navy/src/config-providers/filesystem/index.js @@ -11,7 +11,7 @@ import type {Navy} from '../../navy' async function cwdHasValidDockerComposeConfig() { try { - await execAsync('docker-compose', ['config'], null, { maxBuffer: Infinity, cwd: process.cwd() }) + await execAsync('docker compose', ['config'], null, { maxBuffer: Infinity, cwd: process.cwd() }) } catch (ex) { return false } diff --git a/packages/navy/src/http-proxy.js b/packages/navy/src/http-proxy.js index 7563f9b..76b855a 100644 --- a/packages/navy/src/http-proxy.js +++ b/packages/navy/src/http-proxy.js @@ -67,7 +67,7 @@ export async function reconfigureHTTPProxy(opts: Object = {}) { if (opts.restart) { // proxy needs to be recreated to detect changes (deletes) in /etc/nginx/certs if (fs.existsSync(navyInternalYamlFile)) { log('Restarting HTTP proxy...') - await execAsync('docker-compose', + await execAsync('docker compose', [ '-f', navyInternalYamlFile, '-p', 'navyinternal', 'rm', '-s', '-f', 'nginx-proxy', @@ -78,7 +78,7 @@ export async function reconfigureHTTPProxy(opts: Object = {}) { if (!opts.navies) opts.navies = await getLaunchedNavyNames() await updateComposeConfig(opts.navies) log('Configuring HTTP proxy...') - await execAsync('docker-compose', + await execAsync('docker compose', [ '-f', navyInternalYamlFile, '-p', 'navyinternal',