Skip to content

Commit 94be9c9

Browse files
Remove hyphen from docker compose (#137)
* Update docker compose command * Update more exec commands --------- Co-authored-by: Gilbert Holland-Lloyd <[email protected]>
1 parent 12ff733 commit 94be9c9

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Diff for: packages/navy/src/config-providers/filesystem/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type {Navy} from '../../navy'
1111

1212
async function cwdHasValidDockerComposeConfig() {
1313
try {
14-
await execAsync('docker-compose', ['config'], null, { maxBuffer: Infinity, cwd: process.cwd() })
14+
await execAsync('docker compose', ['config'], null, { maxBuffer: Infinity, cwd: process.cwd() })
1515
} catch (ex) {
1616
return false
1717
}

Diff for: packages/navy/src/drivers/docker-compose/client.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export function createComposeClient(navy: Navy): ComposeClient {
5252
composeArgs.push(command, ...args)
5353

5454
try {
55-
return await execAsync('docker-compose', composeArgs, childProcess => {
55+
return await execAsync('docker compose', composeArgs, childProcess => {
5656
if (!noLog && !pipeLog) {
5757
childProcess.stdout.on('data', data => log(data))
5858
childProcess.stderr.on('data', data => log(data))

Diff for: packages/navy/src/http-proxy.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export async function reconfigureHTTPProxy(opts: Object = {}) {
6767
if (opts.restart) { // proxy needs to be recreated to detect changes (deletes) in /etc/nginx/certs
6868
if (fs.existsSync(navyInternalYamlFile)) {
6969
log('Restarting HTTP proxy...')
70-
await execAsync('docker-compose',
70+
await execAsync('docker compose',
7171
[
7272
'-f', navyInternalYamlFile,
7373
'-p', 'navyinternal', 'rm', '-s', '-f', 'nginx-proxy',
@@ -78,7 +78,7 @@ export async function reconfigureHTTPProxy(opts: Object = {}) {
7878
if (!opts.navies) opts.navies = await getLaunchedNavyNames()
7979
await updateComposeConfig(opts.navies)
8080
log('Configuring HTTP proxy...')
81-
await execAsync('docker-compose',
81+
await execAsync('docker compose',
8282
[
8383
'-f', navyInternalYamlFile,
8484
'-p', 'navyinternal',

0 commit comments

Comments
 (0)