Skip to content

Commit

Permalink
more docker compose updates
Browse files Browse the repository at this point in the history
  • Loading branch information
erickgonzalez committed Aug 13, 2024
1 parent fb4db21 commit 82a13ab
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/actions/run-integration-tests/dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@ exports.COMMANDS = {
]
};
const START_DEPENDENCIES_CMD = {
cmd: 'docker-compose',
cmd: 'docker compose',
args: ['-f', 'open-distro-compose.yml', '-f', `${dbType}-compose.yml`, 'up'],
workingDir: dockerFolder,
env: DEPS_ENV[dbType]
};
const STOP_DEPENDENCIES_CMD = {
cmd: 'docker-compose',
cmd: 'docker compose',
args: ['-f', 'open-distro-compose.yml', '-f', `${dbType}-compose.yml`, 'down'],
workingDir: dockerFolder,
env: DEPS_ENV[dbType]
Expand Down
8 changes: 4 additions & 4 deletions .github/actions/run-postman-tests/dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,10 @@ const startDeps = () => __awaiter(void 0, void 0, void 0, function* () {
Starting postman tests dependencies
=======================================`);
if (includeAnalytics) {
execCmdAsync(toCommand('docker-compose', ['-f', 'analytics-compose.yml', 'up'], dockerFolder));
execCmdAsync(toCommand('docker compose', ['-f', 'analytics-compose.yml', 'up'], dockerFolder));
yield waitFor(140, 'Analytics Infrastructure');
}
execCmdAsync(toCommand('docker-compose', ['-f', 'open-distro-compose.yml', '-f', `${dbType}-compose.yml`, '-f', 'dotcms-compose.yml', 'up'], dockerFolder, DEPS_ENV));
execCmdAsync(toCommand('docker compose', ['-f', 'open-distro-compose.yml', '-f', `${dbType}-compose.yml`, '-f', 'dotcms-compose.yml', 'up'], dockerFolder, DEPS_ENV));
});
/**
* Stop postman depencies: db, ES and DotCMS isntance.
Expand All @@ -238,14 +238,14 @@ const stopDeps = () => __awaiter(void 0, void 0, void 0, function* () {
===================================`);
if (includeAnalytics) {
try {
yield execCmd(toCommand('docker-compose', ['-f', 'analytics-compose.yml', 'down', '-v'], dockerFolder));
yield execCmd(toCommand('docker compose', ['-f', 'analytics-compose.yml', 'down', '-v'], dockerFolder));
}
catch (err) {
console.error(`Error stopping dependencies: ${err}`);
}
}
try {
yield execCmd(toCommand('docker-compose', ['-f', 'open-distro-compose.yml', '-f', `${dbType}-compose.yml`, '-f', 'dotcms-compose.yml', 'down', '-v'], dockerFolder, DEPS_ENV));
yield execCmd(toCommand('docker compose', ['-f', 'open-distro-compose.yml', '-f', `${dbType}-compose.yml`, '-f', 'dotcms-compose.yml', 'down', '-v'], dockerFolder, DEPS_ENV));
}
catch (err) {
console.error(`Error stopping dependencies: ${err}`);
Expand Down

0 comments on commit 82a13ab

Please sign in to comment.