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

Corrects PHP-FPM to use host.docker.internal for xdebug #1387

Merged
merged 6 commits into from Nov 26, 2019

Conversation

@fubarhouse
Copy link
Contributor

fubarhouse commented Nov 8, 2019

Checklist

  • Affected Issues have been mentioned in the Closing issues section
  • Documentation has been written/updated.
  • Changelog entry has been written

Changelog Entry

Bugfix - Improves discoverability of Docker host for xdebug

Closing issues

Closes #1088

1. Changes `ping` tests to `nslookup`.
2. Combines Windows and MacOS tests into `host.docker.internal`
3. Removes check for `172.16.172.16`
@fubarhouse fubarhouse force-pushed the fubarhouse:amazee/1088 branch from c61e52e to 69aff04 Nov 8, 2019
# https://github.com/amazeeio/pygmy/blob/267ba143158548628f190f05ecb5cb2c19212038/lib/pygmy/resolv_osx.rb#L26
if busybox timeout -t 1 ping -c1 172.16.172.16 &> /dev/null; then
echo "172.16.172.16"
if busybox nslookup host.docker.internal &> /dev/null; then

This comment has been minimized.

Copy link
@Schnitzel

Schnitzel Nov 11, 2019

Member

as this is run inside an entrypoint and a DNS issue would block the whole container from coming up: can we add a timeout command in front of it with 1sec timeout? Just to be sure that we don't have any weird DNS issues affecting our containers :)

This comment has been minimized.

Copy link
@fubarhouse

fubarhouse Nov 12, 2019

Author Contributor

Switched to busybox timeout 1 nslookup host.docker.internal.

Co-Authored-By: Michael Schmid <michael@amazee.com>
@Schnitzel Schnitzel added this to the v1.2.0 milestone Nov 18, 2019
Schnitzel added 3 commits Nov 18, 2019
@Schnitzel Schnitzel merged commit 5da7712 into amazeeio:master Nov 26, 2019
1 check passed
1 check passed
continuous-integration/jenkins/pr-merge This commit looks good
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.