diff --git a/cli/src/prerequisites/dockerPrerequisites.ts b/cli/src/prerequisites/dockerPrerequisites.ts index 96f92f3..2091f36 100644 --- a/cli/src/prerequisites/dockerPrerequisites.ts +++ b/cli/src/prerequisites/dockerPrerequisites.ts @@ -57,14 +57,14 @@ export class DockerPrerequisites implements Prerequisites { } dockerSpinner.succeed('Docker is installed') - const dockerComposeSpinner = ora('Checking if docker-compose is installed...').start() + const dockerComposeSpinner = ora('Checking if docker compose is installed...').start() try { - await execCustom('which docker-compose') + await execCustom('docker compose') } catch (e) { - dockerComposeSpinner.fail('Docker-compose is not installed') + dockerComposeSpinner.fail('Docker compose is not installed') throw dockerNotInstalledMessage } - dockerComposeSpinner.succeed('Docker-compose is installed') + dockerComposeSpinner.succeed('Docker compose is installed') const dockerDaemonSpinner = ora('Checking if docker daemon is running...').start() try { diff --git a/cli/src/result/resultLogger.ts b/cli/src/result/resultLogger.ts index 581f966..bdf2fbc 100644 --- a/cli/src/result/resultLogger.ts +++ b/cli/src/result/resultLogger.ts @@ -36,7 +36,7 @@ export class ResultLogger { } if (containerResults.genesisEgldPemPath) { - const addressPrivateKey = (await execCustomInRepo(`docker-compose exec localnet cat ${containerResults.genesisEgldPemPath}`)).stdout.toString() + const addressPrivateKey = (await execCustomInRepo(`docker compose exec localnet cat ${containerResults.genesisEgldPemPath}`)).stdout.toString() firstPartResultString += ` An address with 1,000,000 EGLD was generated for you. Here are the details: @@ -55,7 +55,7 @@ export class ResultLogger { let mxOpsDisplayString = '' if (config.mxOpsScenesPath) { - const mxopsXNetworkValuesRaw = (await execCustomInRepo(`docker-compose exec localnet python3 -m mxops data get -n LOCAL -s xnetwork`)).stdout.toString() + const mxopsXNetworkValuesRaw = (await execCustomInRepo(`docker compose exec localnet python3 -m mxops data get -n LOCAL -s xnetwork`)).stdout.toString() const searchString = 'ABSOLUTELY NO WARRANTY\n' const mxopsXNetworkValues = mxopsXNetworkValuesRaw.substring(mxopsXNetworkValuesRaw.lastIndexOf(searchString) + searchString.length).trim() const mxopsXNetworkValuesObject = JSON.parse(mxopsXNetworkValues) diff --git a/cli/src/utils/docker/createNetwork.ts b/cli/src/utils/docker/createNetwork.ts index 19e0792..a567a0e 100644 --- a/cli/src/utils/docker/createNetwork.ts +++ b/cli/src/utils/docker/createNetwork.ts @@ -72,11 +72,11 @@ export async function createNetwork(config: CLIConfig) { if (config.mxOpsScenesPath) { const copyingScenesSpinner = ora('Copying mxops scenes...').start() - await execCustomInRepo(`docker-compose cp ${config.mxOpsScenesPath} localnet:/home/ubuntu/mxops`) + await execCustomInRepo(`docker compose cp ${config.mxOpsScenesPath} localnet:/home/ubuntu/mxops`) copyingScenesSpinner.succeed('Copied mxops scenes') const runningScenesSpinner = ora('Running mxops scenes...').start() - await execCustomInRepo(`docker-compose exec localnet python3 run_mxops.py`) + await execCustomInRepo(`docker compose exec localnet python3 run_mxops.py`) runningScenesSpinner.succeed('Ran mxops scenes') } diff --git a/cli/src/utils/docker/getNetworkState.ts b/cli/src/utils/docker/getNetworkState.ts index 5f155f9..9c8dcb9 100644 --- a/cli/src/utils/docker/getNetworkState.ts +++ b/cli/src/utils/docker/getNetworkState.ts @@ -18,7 +18,7 @@ export async function getNetworkState(): Promise { const containerState = await getLocalnetContainerState() try { - const containerResultsRaw = (await execCustomInRepo("docker-compose exec localnet cat /home/ubuntu/results.json")).stdout.toString() + const containerResultsRaw = (await execCustomInRepo("docker compose exec localnet cat /home/ubuntu/results.json")).stdout.toString() const containerResults: LocalnetResult = JSON.parse(containerResultsRaw) return { @@ -35,7 +35,7 @@ export async function getNetworkState(): Promise { async function getLocalnetContainerState(): Promise { try { - const stdout = (await execCustomInRepo('docker-compose ps -a -q localnet')).stdout.toString() + const stdout = (await execCustomInRepo('docker compose ps -a -q localnet')).stdout.toString() const containerId = stdout.trim() diff --git a/cli/src/utils/docker/pauseExistingNetwork.ts b/cli/src/utils/docker/pauseExistingNetwork.ts index c23e158..a3ecfe4 100644 --- a/cli/src/utils/docker/pauseExistingNetwork.ts +++ b/cli/src/utils/docker/pauseExistingNetwork.ts @@ -32,7 +32,7 @@ export async function pauseExistingNetwork() { } async function pauseContainer(containerInfos: ContainerInfos) { - const command = containerInfos.pauseBehavior === PauseBehavior.PAUSE ? 'docker-compose stop' : 'yes | docker-compose rm -s -v' + const command = containerInfos.pauseBehavior === PauseBehavior.PAUSE ? 'docker compose stop' : 'yes | docker compose rm -s -v' const pausingVerb = containerInfos.pauseBehavior === PauseBehavior.PAUSE ? 'Pausing' : 'Stopping' const pausedVerb = containerInfos.pauseBehavior === PauseBehavior.PAUSE ? 'Paused' : 'Stopped' diff --git a/cli/src/utils/docker/removeExistingNetwork.ts b/cli/src/utils/docker/removeExistingNetwork.ts index 8cfa488..40dadaf 100644 --- a/cli/src/utils/docker/removeExistingNetwork.ts +++ b/cli/src/utils/docker/removeExistingNetwork.ts @@ -3,6 +3,6 @@ import ora from "ora"; export async function removeExistingNetwork() { const removingNetworkSpinner = ora('Removing the previous network...').start() - await execCustomInRepo(`docker-compose down`, false) + await execCustomInRepo(`docker compose down`, false) removingNetworkSpinner.succeed('Removed the previous network successfully') } diff --git a/cli/src/utils/docker/resumeExistingNetwork.ts b/cli/src/utils/docker/resumeExistingNetwork.ts index d8cae1a..640add2 100644 --- a/cli/src/utils/docker/resumeExistingNetwork.ts +++ b/cli/src/utils/docker/resumeExistingNetwork.ts @@ -37,7 +37,7 @@ async function resumeContainer(containerInfos: ContainerInfos) { const removingNetworkSpinner = ora(`Resuming ${containerInfos.name}...`).start() if (containerInfos.pauseBehavior === PauseBehavior.PAUSE) { - await execCustomInRepo(`docker-compose start ${containerInfos.name}`, false) + await execCustomInRepo(`docker compose start ${containerInfos.name}`, false) } else { await upContainer(containerInfos.name, undefined, false) } diff --git a/cli/src/utils/docker/upContainer.ts b/cli/src/utils/docker/upContainer.ts index df118c1..cf065c2 100644 --- a/cli/src/utils/docker/upContainer.ts +++ b/cli/src/utils/docker/upContainer.ts @@ -2,7 +2,7 @@ import {execCustomInRepo} from "../exec.js"; export async function upContainer(containerName: string, env?: NodeJS.ProcessEnv, shouldBuild: boolean = true) { if (shouldBuild) { - await execCustomInRepo(`docker-compose build --no-cache ${containerName}`, false, {env: env}) + await execCustomInRepo(`docker compose build --no-cache ${containerName}`, false, {env: env}) } - await execCustomInRepo(`docker-compose up -d ${containerName}`, false, {env: env}) + await execCustomInRepo(`docker compose up -d ${containerName}`, false, {env: env}) }