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

Update to compatible docker compose usage #195

Merged
merged 14 commits into from
Nov 15, 2023
Merged

Update to compatible docker compose usage #195

merged 14 commits into from
Nov 15, 2023

Conversation

rolljee
Copy link
Contributor

@rolljee rolljee commented Nov 14, 2023

What does this PR do?

This PR update kourou to use docker compose instead of docker-compose

How should this be manually tested?

  • Step 1 : ./bin/run app:doctor
  • Step 2 : ./bin/run instance:kill
  • Step 3 : ./bin/run instance:spawn
    ...

Other changes

Boyscout

@rolljee rolljee self-assigned this Nov 14, 2023
@rolljee rolljee linked an issue Nov 14, 2023 that may be closed by this pull request
@rolljee rolljee changed the base branch from master to 1-dev November 14, 2023 16:09
src/commands/app/doctor.ts Outdated Show resolved Hide resolved
src/commands/app/start-services.ts Outdated Show resolved Hide resolved
src/commands/app/start-services.ts Outdated Show resolved Hide resolved
src/commands/app/start-services.ts Outdated Show resolved Hide resolved
const matches = docov.stdout.match(/[^0-9.]*([0-9.]*).*/);
if (matches === null) {
throw new Error(
"Unable to read docker-compose verson. This is weird."
"Unable to read docker compose verson. This is weird."
);
}
const docoVersion = matches.length > 0 ? matches[1] : null;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check seems wrong. It should check that there is at least two matches: matches.length >= 2

src/commands/instance/spawn.ts Outdated Show resolved Hide resolved
src/commands/instance/spawn.ts Outdated Show resolved Hide resolved
src/commands/instance/spawn.ts Outdated Show resolved Hide resolved
src/commands/instance/spawn.ts Outdated Show resolved Hide resolved
src/commands/instance/spawn.ts Outdated Show resolved Hide resolved
src/commands/app/doctor.ts Outdated Show resolved Hide resolved
@rolljee rolljee requested a review from Kuruyia November 15, 2023 10:05
Copy link
Contributor

@Kuruyia Kuruyia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@rolljee rolljee merged commit ac98525 into 1-dev Nov 15, 2023
4 checks passed
@rolljee rolljee deleted the fix/update-doco branch November 15, 2023 10:39
@rolljee rolljee mentioned this pull request Nov 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

We need support for docker compose V2
3 participants