Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/scripts/install-docker.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

set -x
VER="18.06.3-ce"
VER="20.10.19"
curl -L -o /tmp/docker-$VER.tgz https://download.docker.com/linux/static/stable/x86_64/docker-$VER.tgz
tar -xz -C /tmp -f /tmp/docker-$VER.tgz
mv /tmp/docker/* /usr/bin
5 changes: 4 additions & 1 deletion integration/e2e/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,10 @@ func (s *HTTPService) Metrics() (_ string, err error) {
localPort := s.networkPortsContainerToLocal[s.httpPort]

// Fetch metrics.
res, err := GetRequest(fmt.Sprintf("http://localhost:%d/metrics", localPort))
// We use IPv4 ports from Dokcer for e2e tests, so lt's use 127.0.0.1 to force IPv4; localhost may map to IPv6.
// It's possible that same port number map to IPv4 for serviceA and IPv6 for servieB, so using localhost makes
// tests flaky because you connect to serviceB while you want to connec to serviceA.
res, err := GetRequest(fmt.Sprintf("http://127.0.0.1:%d/metrics", localPort))
if err != nil {
return "", err
}
Expand Down