Skip to content

Commit 060564d

Browse files
authored
Upgrade docker engine to latest verison (#4961)
Signed-off-by: Alvin Lin <[email protected]>
1 parent ba6b156 commit 060564d

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
set -x
4-
VER="18.06.3-ce"
4+
VER="20.10.19"
55
curl -L -o /tmp/docker-$VER.tgz https://download.docker.com/linux/static/stable/x86_64/docker-$VER.tgz
66
tar -xz -C /tmp -f /tmp/docker-$VER.tgz
77
mv /tmp/docker/* /usr/bin

integration/e2e/service.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,10 @@ func (s *HTTPService) Metrics() (_ string, err error) {
523523
localPort := s.networkPortsContainerToLocal[s.httpPort]
524524

525525
// Fetch metrics.
526-
res, err := GetRequest(fmt.Sprintf("http://localhost:%d/metrics", localPort))
526+
// 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.
527+
// It's possible that same port number map to IPv4 for serviceA and IPv6 for servieB, so using localhost makes
528+
// tests flaky because you connect to serviceB while you want to connec to serviceA.
529+
res, err := GetRequest(fmt.Sprintf("http://127.0.0.1:%d/metrics", localPort))
527530
if err != nil {
528531
return "", err
529532
}

0 commit comments

Comments
 (0)