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

[docs] Improve ordering of Colima installation #4255

Merged
merged 2 commits into from
Oct 6, 2022
Merged

[docs] Improve ordering of Colima installation #4255

merged 2 commits into from
Oct 6, 2022

Conversation

filimoreira
Copy link
Contributor

@filimoreira filimoreira commented Oct 4, 2022

The Problem/Issue/Bug:

If I first run ´ddev config global --mutagen-enabled´ I get this error message:
Could not connect to a docker provider. Please start or install a docker provider. For install help go to: https://ddev.readthedocs.io/en/latest/users/install/

How this PR Solves The Problem:

Change the order (switch 2. ´ddev config global --mutagen-enabled´ & 3. colima start --cpu 4 --memory 6 --disk 100 --dns=1.1.1.1)

Manual Testing Instructions:

Automated Testing Overview:

it's a cmd command

Related Issue Link(s):

https://ddev.readthedocs.io/en/latest/users/install/docker-installation/

Release/Deployment notes:

no

@rfay
Copy link
Member

rfay commented Oct 4, 2022

I'm baffled why you closed this, then redid it, and redid it without the change I added.

@filimoreira
Copy link
Contributor Author

I closed it by mistaken. Can you send it again?

@rfay
Copy link
Member

rfay commented Oct 5, 2022

When you closed it by accident, Github offered you the option of reopening it. It probably still does. Don't worry about it. But try not to do that again. We'll use this one as a reminder.

@filimoreira
Copy link
Contributor Author

I am very sorry. I'm new to pull requests from other repositories. Unfortunately I don't have your changes anymore... for this reason I could not add them anymore.

@filimoreira
Copy link
Contributor Author

I hope I have now made the correct corrections! Thanks for your tolerance.

@rfay rfay changed the title Update docker-installation.md [docs] Improve ordering of Colima installation Oct 5, 2022
@rfay
Copy link
Member

rfay commented Oct 5, 2022

I rebased this. Please review it again @filimoreira

Here's the built version https://ddev--4255.org.readthedocs.build/en/4255/users/install/docker-installation/#colima

@rfay rfay requested a review from mattstein October 5, 2022 23:40
Copy link
Sponsor Collaborator

@mattstein mattstein left a comment

Choose a reason for hiding this comment

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

Looks like some stuff got re-added twice. Made a few minor suggestions as well. Let me know if any of it’s unclear!

@@ -16,16 +16,46 @@ You’ll need a Docker provider on your system before you can [install DDEV](dde
Yes! See *Why do you recommend Colima over Docker Desktop on macOS?* in [the FAQ](../basics/faq.md).

1. Run `docker help` to make sure you’ve got the Docker client installed. If you get an error, install it with [Homebrew]() by running `brew install docker`.
Copy link
Sponsor Collaborator

Choose a reason for hiding this comment

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

Add missing link:

Suggested change
1. Run `docker help` to make sure you’ve got the Docker client installed. If you get an error, install it with [Homebrew]() by running `brew install docker`.
1. Run `docker help` to make sure you’ve got the Docker client installed. If you get an error, install it with [Homebrew](https://brew.sh) by running `brew install docker`.


After the initial run in step 4 above, you can just use `colima start` or use `colima start -e` to edit the configuration file. Run `colima status` at any time to check Colima’s status.
After the initial run above, you can just use `colima start` or use `colima start -e` to edit the configuration file. Run `colima status` at any time to check Colima’s status.
Copy link
Sponsor Collaborator

Choose a reason for hiding this comment

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

Get rid of “just”. (I must have missed this earlier!)

Suggested change
After the initial run above, you can just use `colima start` or use `colima start -e` to edit the configuration file. Run `colima status` at any time to check Colima’s status.
After the initial run above, you can use `colima start` or use `colima start -e` to edit the configuration file. Run `colima status` at any time to check Colima’s status.


Reasons to use Colima include:
Copy link
Sponsor Collaborator

Choose a reason for hiding this comment

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

Somehow lines 28–42 and 44–58 got re-added twice. Could you please delete each of those chunks?

You can use this page for reference; should see...

  • Steps 1-4
  • “After the initial run (...)”
  • “When your computer restarts, (...)”
  • Tip: “Colima disk allocation”
  • Warning: “Docker contexts let (...)”

Copy link
Member

Choose a reason for hiding this comment

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

Life is so hard :)

@rfay
Copy link
Member

rfay commented Oct 6, 2022

I gave up on the rebase and just applied the changes again :( Please take a look again both of you. :(

@mattstein
Copy link
Sponsor Collaborator

Looks good to me, @rfay!

@rfay rfay merged commit 24e0491 into ddev:master Oct 6, 2022
@rfay
Copy link
Member

rfay commented Oct 6, 2022

Thanks for fixing this @filimoreira !

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.

None yet

3 participants