Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove hyphen from docker compose #137

Merged
merged 2 commits into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/navy/src/config-providers/filesystem/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion packages/navy/src/drivers/docker-compose/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export function createComposeClient(navy: Navy): ComposeClient {
composeArgs.push(command, ...args)

try {
return await execAsync('docker-compose', composeArgs, childProcess => {
return await execAsync('docker compose', composeArgs, childProcess => {
if (!noLog && !pipeLog) {
childProcess.stdout.on('data', data => log(data))
childProcess.stderr.on('data', data => log(data))
Expand Down
4 changes: 2 additions & 2 deletions packages/navy/src/http-proxy.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand Down
Loading