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

Updates for docker compose plugin. #192

Closed

Conversation

jvanderaa
Copy link
Contributor

Closes: #191

What's Changed

Moves from docker-compose standalone to docker compose plugin

TODO

  • Explanation of Change(s)
  • Added change log fragment(s) (for more information see the documentation)
  • Attached Screenshots, Payload Example
  • Unit, Integration Tests
  • Documentation Updates (when adding/changing features)
  • Outline Remaining Work, Constraints from Design

docs/dev/dev_environment.md Outdated Show resolved Hide resolved
docs/dev/dev_environment.md Outdated Show resolved Hide resolved
docs/dev/dev_environment.md Outdated Show resolved Hide resolved
docs/dev/dev_environment.md Outdated Show resolved Hide resolved
docs/dev/dev_environment.md Outdated Show resolved Hide resolved
docs/dev/dev_environment.md Outdated Show resolved Hide resolved
docs/dev/dev_environment.md Outdated Show resolved Hide resolved
docs/dev/dev_environment.md Outdated Show resolved Hide resolved
docs/dev/dev_environment.md Outdated Show resolved Hide resolved
docs/dev/dev_environment.md Outdated Show resolved Hide resolved
@jvanderaa
Copy link
Contributor Author

The MKDocs stuff should really move to something with >, like using >>>

@jvanderaa jvanderaa requested a review from smk4664 June 5, 2023 21:08
@jvanderaa
Copy link
Contributor Author

@smk4664 can we merge this? I just set up a new system and needed to re-implement this change just to get to doing some work.

Copy link
Contributor

@smk4664 smk4664 left a comment

Choose a reason for hiding this comment

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

It looks like this may not be needed anymore with a previous pr updating this already.

@@ -99,6 +99,8 @@ def docker_compose(context, command, **kwargs):
"PYTHON_VER": context.nautobot_chatops.python_ver,
**kwargs.pop("env", {}),
}

compose_command = f'docker compose --project-name {context.nautobot_chatops.project_name} --project-directory "{context.nautobot_chatops.compose_dir}"'
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't understand this change, it is just going to be overridden a few lines below when it joins the compose command tokens.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What is the difference between the tokens and this? It was a merge conflict, and I am not familiar with command tokens.

Copy link
Contributor

Choose a reason for hiding this comment

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

#212 Replaced docker-compose with docker compose among other changes. I believe this is why you get the merge conflict.

@jvanderaa jvanderaa closed this Jul 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Convert docker-compose to docker compose
2 participants