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.

Sign up for GitHub

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

Jump to bottom

Increase timeout on ddev-router and ddev-webserver for slower machines, fixes #2120 #2123

Merged
merged 3 commits into from
May 28, 2020
Merged

Increase timeout on ddev-router and ddev-webserver for slower machines, fixes #2120 #2123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a6f86d
Increase timeout on ddev-router for slower machines, fixes #2120
rfay Mar 24, 2020
1558273
Increase timeout on web container as well
rfay May 27, 2020
f3d1e1d
Increase test timeout for windows machines [skip ci][ci skip]
rfay May 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ include build-tools/makefile_components/base_build_go.mak

TESTOS = $(shell uname -s | tr '[:upper:]' '[:lower:]')

TEST_TIMEOUT=120m
TEST_TIMEOUT=150m
BUILD_ARCH = $(shell go env GOARCH)
ifeq ($(BUILD_OS),linux)
DDEV_BINARY_FULLPATH=$(PWD)/$(GOTMP)/bin/ddev
Expand Down
8 changes: 4 additions & 4 deletions pkg/ddevapp/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ services:
{{ end }}
healthcheck:
interval: 1s
retries: 10
start_period: 10s
retries: 20
start_period: 20s
timeout: 120s

{{ if not .OmitDBA }}
Expand Down Expand Up @@ -409,8 +409,8 @@ services:
restart: "no"
healthcheck:
interval: 1s
retries: 10
start_period: 10s
retries: 20
start_period: 20s
timeout: 120s

networks:
Expand Down