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

Improve router-compose and ssh-auth-compose handling, fixes #1779, fixes #2476 #2505

Merged
merged 8 commits into from Sep 17, 2020

Conversation

rfay
Copy link
Member

@rfay rfay commented Sep 10, 2020

The Problem/Issue/Bug:

  1. Doing a ddev stop or ddev restart when you've never done a ddev start to create the router-compose.yaml causes a fatal error (Unable to find .ddev/router-compose.yaml when restarting ddev when it has never been started #1779)
  2. It's never been possible to override the router and ssh-agent configs, which makes development hard sometimes, and provides no workarounds for user needs.
  3. Letsencrypt volume (recent addition) was being created even if letsencrypt was not in use.

How this PR Solves The Problem:

  • Create the .ddev-router-compose.yaml before stop
  • Allow overriding with router-compose..yaml and ssh-auth-compose..yaml
  • Make sure the letsencrypt volume doesn't get created by default

Manual Testing Instructions:

  • ddev poweroff && rm ~/.ddev/.ddev-router-compose* && ddev stop. It should work fine.
  • Add new ssh-auth-compose..yaml and router-compose..yaml like this gist and verify that when the container gets created (after ddev poweroff the expected stuff is used (docker exec ddev-router bash -c 'echo $ANSWER' should get "42", as should docker exec ddev-ssh-agent bash -c 'echo $ANSWER'
  • docker volume rm ddev-router-letsencrypt - failure is OK. Then ddev start and verify that no letsencrypt volume is created.

Automated Testing Overview:

Related Issue Link(s):

Release/Deployment notes:

This changes the names of the router-compose and ssh-auth-compose files to hidden files, .router-compose.yaml, .router-compose-full.yaml, .ssh-auth-compose.yaml, .ssh-auth-compose-full.yaml

@rfay rfay force-pushed the 20200910_router_compose_yaml branch from bcc5fad to b6f9b2e Compare September 16, 2020 14:57
@rfay rfay force-pushed the 20200910_router_compose_yaml branch from be165fc to 3b86d81 Compare September 17, 2020 03:16
@rfay rfay merged commit 5845120 into ddev:master Sep 17, 2020
@rfay rfay deleted the 20200910_router_compose_yaml branch September 17, 2020 12:27
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

1 participant