In order to run tests at mips64el device.
Now official-images has supported the following images for mips64el.
buildpack-deps:stretch
buildpack-deps:buster
debian:stretch
debian:buster
But official-images does not support the following images for mips64el.
debian:jessie
buildpack-deps:jessie
Signed-off-by: wanghuaiqing <wanghuaiqing@loongson.cn>
... | ... |
@@ -89,11 +89,11 @@ RUN --mount=type=cache,sharing=locked,id=moby-frozen-images-aptlib,target=/var/l |
89 | 89 |
# Get useful and necessary Hub images so we can "docker load" locally instead of pulling |
90 | 90 |
COPY contrib/download-frozen-image-v2.sh / |
91 | 91 |
RUN /download-frozen-image-v2.sh /build \ |
92 |
- buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \ |
|
93 |
- busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \ |
|
94 |
- busybox:glibc@sha256:0b55a30394294ab23b9afd58fab94e61a923f5834fba7ddbae7f8e0c11ba85e6 \ |
|
95 |
- debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \ |
|
96 |
- hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c |
|
92 |
+ buildpack-deps:buster@sha256:d0abb4b1e5c664828b93e8b6ac84d10bce45ee469999bef88304be04a2709491 \ |
|
93 |
+ busybox:latest@sha256:95cf004f559831017cdf4628aaf1bb30133677be8702a8c5f2994629f637a209 \ |
|
94 |
+ busybox:glibc@sha256:1f81263701cddf6402afe9f33fca0266d9fff379e59b1748f33d3072da71ee85 \ |
|
95 |
+ debian:buster@sha256:46d659005ca1151087efa997f1039ae45a7bf7a2cbbe2d17d3dcbda632a3ee9a \ |
|
96 |
+ hello-world:latest@sha256:d58e752213a51785838f9eed2b7a498ffa1cb3aa7f946dda11af39286c3db9a9 |
|
97 | 97 |
# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list) |
98 | 98 |
|
99 | 99 |
FROM base AS cross-false |
... | ... |
@@ -18,11 +18,11 @@ FROM base AS frozen-images |
18 | 18 |
# Get useful and necessary Hub images so we can "docker load" locally instead of pulling |
19 | 19 |
COPY contrib/download-frozen-image-v2.sh / |
20 | 20 |
RUN /download-frozen-image-v2.sh /build \ |
21 |
- buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \ |
|
22 |
- busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \ |
|
23 |
- busybox:glibc@sha256:0b55a30394294ab23b9afd58fab94e61a923f5834fba7ddbae7f8e0c11ba85e6 \ |
|
24 |
- debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \ |
|
25 |
- hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c |
|
21 |
+ buildpack-deps:buster@sha256:d0abb4b1e5c664828b93e8b6ac84d10bce45ee469999bef88304be04a2709491 \ |
|
22 |
+ busybox:latest@sha256:95cf004f559831017cdf4628aaf1bb30133677be8702a8c5f2994629f637a209 \ |
|
23 |
+ busybox:glibc@sha256:1f81263701cddf6402afe9f33fca0266d9fff379e59b1748f33d3072da71ee85 \ |
|
24 |
+ debian:buster@sha256:46d659005ca1151087efa997f1039ae45a7bf7a2cbbe2d17d3dcbda632a3ee9a \ |
|
25 |
+ hello-world:latest@sha256:d58e752213a51785838f9eed2b7a498ffa1cb3aa7f946dda11af39286c3db9a9 |
|
26 | 26 |
# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list) |
27 | 27 |
|
28 | 28 |
FROM base AS dockercli |
... | ... |
@@ -15,7 +15,7 @@ fi |
15 | 15 |
usage() { |
16 | 16 |
echo "usage: $0 dir image[:tag][@image-id] ..." |
17 | 17 |
echo " ie: $0 /tmp/hello-world hello-world" |
18 |
- echo " $0 /tmp/debian-jessie debian:jessie" |
|
18 |
+ echo " $0 /tmp/debian-buster debian:buster" |
|
19 | 19 |
echo " $0 /tmp/old-hello-world hello-world@ef872312fe1bbc5e05aae626791a47ee9b032efa8f3bda39cc0be7b56bfe59b9" |
20 | 20 |
echo " $0 /tmp/old-debian debian:latest@f6fab3b798be3174f45aa1eb731f8182705555f89c9026d8c1ef230cbf8301dd" |
21 | 21 |
[ -z "$1" ] || exit "$1" |
... | ... |
@@ -5,7 +5,7 @@ mkimg="$(basename "$0")" |
5 | 5 |
|
6 | 6 |
usage() { |
7 | 7 |
echo >&2 "usage: $mkimg [-d dir] [-t tag] [--compression algo| --no-compression] script [script-args]" |
8 |
- echo >&2 " ie: $mkimg -t someuser/debian debootstrap --variant=minbase jessie" |
|
8 |
+ echo >&2 " ie: $mkimg -t someuser/debian debootstrap --variant=minbase buster" |
|
9 | 9 |
echo >&2 " $mkimg -t someuser/ubuntu debootstrap --include=ubuntu-minimal --components=main,universe trusty" |
10 | 10 |
echo >&2 " $mkimg -t someuser/busybox busybox-static" |
11 | 11 |
echo >&2 " $mkimg -t someuser/centos:5 rinse --distribution centos-5" |
... | ... |
@@ -394,7 +394,7 @@ func (s *DockerSuite) TestContainerAPIPause(c *testing.T) { |
394 | 394 |
|
395 | 395 |
func (s *DockerSuite) TestContainerAPITop(c *testing.T) { |
396 | 396 |
testRequires(c, DaemonIsLinux) |
397 |
- out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "top") |
|
397 |
+ out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "top && true") |
|
398 | 398 |
id := strings.TrimSpace(out) |
399 | 399 |
assert.NilError(c, waitRun(id)) |
400 | 400 |
|
... | ... |
@@ -411,7 +411,7 @@ func (s *DockerSuite) TestContainerAPITop(c *testing.T) { |
411 | 411 |
c.Fatalf("expected `USER` at `Titles[0]` and `COMMAND` at Titles[10]: %v", top.Titles) |
412 | 412 |
} |
413 | 413 |
assert.Equal(c, len(top.Processes), 2, fmt.Sprintf("expected 2 processes, found %d: %v", len(top.Processes), top.Processes)) |
414 |
- assert.Equal(c, top.Processes[0][10], "/bin/sh -c top") |
|
414 |
+ assert.Equal(c, top.Processes[0][10], "/bin/sh -c top && true") |
|
415 | 415 |
assert.Equal(c, top.Processes[1][10], "top") |
416 | 416 |
} |
417 | 417 |
|
... | ... |
@@ -25,7 +25,7 @@ func (s *DockerSuite) TestCpToContainerWithPermissions(c *testing.T) { |
25 | 25 |
|
26 | 26 |
containerName := "permtest" |
27 | 27 |
|
28 |
- _, exc := dockerCmd(c, "create", "--name", containerName, "debian:jessie", "/bin/bash", "-c", "stat -c '%u %g %a' /permdirtest /permdirtest/permtest") |
|
28 |
+ _, exc := dockerCmd(c, "create", "--name", containerName, "busybox", "/bin/sh", "-c", "stat -c '%u %g %a' /permdirtest /permdirtest/permtest") |
|
29 | 29 |
assert.Equal(c, exc, 0) |
30 | 30 |
defer dockerCmd(c, "rm", "-f", containerName) |
31 | 31 |
|
... | ... |
@@ -957,7 +957,7 @@ func (s *DockerDaemonSuite) TestDaemonUlimitDefaults(c *testing.T) { |
957 | 957 |
|
958 | 958 |
s.d.StartWithBusybox(c, "--default-ulimit", "nofile=42:42", "--default-ulimit", "nproc=1024:1024") |
959 | 959 |
|
960 |
- out, err := s.d.Cmd("run", "--ulimit", "nproc=2048", "--name=test", "busybox", "/bin/sh", "-c", "echo $(ulimit -n); echo $(ulimit -p)") |
|
960 |
+ out, err := s.d.Cmd("run", "--ulimit", "nproc=2048", "--name=test", "busybox", "/bin/sh", "-c", "echo $(ulimit -n); echo $(ulimit -u)") |
|
961 | 961 |
if err != nil { |
962 | 962 |
c.Fatal(err, out) |
963 | 963 |
} |
... | ... |
@@ -973,7 +973,7 @@ func (s *DockerDaemonSuite) TestDaemonUlimitDefaults(c *testing.T) { |
973 | 973 |
c.Fatalf("expected `ulimit -n` to be `42`, got: %s", nofile) |
974 | 974 |
} |
975 | 975 |
if nproc != "2048" { |
976 |
- c.Fatalf("expected `ulimit -p` to be 2048, got: %s", nproc) |
|
976 |
+ c.Fatalf("expected `ulimit -u` to be 2048, got: %s", nproc) |
|
977 | 977 |
} |
978 | 978 |
|
979 | 979 |
// Now restart daemon with a new default |
... | ... |
@@ -1770,7 +1770,7 @@ func (s *DockerDaemonSuite) TestDaemonNoSpaceLeftOnDeviceError(c *testing.T) { |
1770 | 1770 |
defer mount.Unmount(testDir) |
1771 | 1771 |
|
1772 | 1772 |
// create a 3MiB image (with a 2MiB ext4 fs) and mount it as graph root |
1773 |
- // Why in a container? Because `mount` sometimes behaves weirdly and often fails outright on this test in debian:jessie (which is what the test suite runs under if run from the Makefile) |
|
1773 |
+ // Why in a container? Because `mount` sometimes behaves weirdly and often fails outright on this test in debian:buster (which is what the test suite runs under if run from the Makefile) |
|
1774 | 1774 |
dockerCmd(c, "run", "--rm", "-v", testDir+":/test", "busybox", "sh", "-c", "dd of=/test/testfs.img bs=1M seek=3 count=0") |
1775 | 1775 |
icmd.RunCommand("mkfs.ext4", "-F", filepath.Join(testDir, "testfs.img")).Assert(c, icmd.Success) |
1776 | 1776 |
|
... | ... |
@@ -1574,7 +1574,7 @@ func (s *DockerSuite) TestEmbeddedDNSInvalidInput(c *testing.T) { |
1574 | 1574 |
dockerCmd(c, "network", "create", "-d", "bridge", "nw1") |
1575 | 1575 |
|
1576 | 1576 |
// Sending garbage to embedded DNS shouldn't crash the daemon |
1577 |
- dockerCmd(c, "run", "-i", "--net=nw1", "--name=c1", "debian:jessie", "bash", "-c", "echo InvalidQuery > /dev/udp/127.0.0.11/53") |
|
1577 |
+ dockerCmd(c, "run", "-i", "--net=nw1", "--name=c1", "debian:buster", "bash", "-c", "echo InvalidQuery > /dev/udp/127.0.0.11/53") |
|
1578 | 1578 |
} |
1579 | 1579 |
|
1580 | 1580 |
func (s *DockerSuite) TestDockerNetworkConnectFailsNoInspectChange(c *testing.T) { |
... | ... |
@@ -2930,7 +2930,7 @@ func (s *DockerSuite) TestRunUnshareProc(c *testing.T) { |
2930 | 2930 |
|
2931 | 2931 |
go func() { |
2932 | 2932 |
name := "acidburn" |
2933 |
- out, _, err := dockerCmdWithError("run", "--name", name, "--security-opt", "seccomp=unconfined", "debian:jessie", "unshare", "-p", "-m", "-f", "-r", "--mount-proc=/proc", "mount") |
|
2933 |
+ out, _, err := dockerCmdWithError("run", "--name", name, "--security-opt", "seccomp=unconfined", "debian:buster", "unshare", "-p", "-m", "-f", "-r", "--mount-proc=/proc", "mount") |
|
2934 | 2934 |
if err == nil || |
2935 | 2935 |
!(strings.Contains(strings.ToLower(out), "permission denied") || |
2936 | 2936 |
strings.Contains(strings.ToLower(out), "operation not permitted")) { |
... | ... |
@@ -2942,7 +2942,7 @@ func (s *DockerSuite) TestRunUnshareProc(c *testing.T) { |
2942 | 2942 |
|
2943 | 2943 |
go func() { |
2944 | 2944 |
name := "cereal" |
2945 |
- out, _, err := dockerCmdWithError("run", "--name", name, "--security-opt", "seccomp=unconfined", "debian:jessie", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc") |
|
2945 |
+ out, _, err := dockerCmdWithError("run", "--name", name, "--security-opt", "seccomp=unconfined", "debian:buster", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc") |
|
2946 | 2946 |
if err == nil || |
2947 | 2947 |
!(strings.Contains(strings.ToLower(out), "mount: cannot mount none") || |
2948 | 2948 |
strings.Contains(strings.ToLower(out), "permission denied") || |
... | ... |
@@ -2956,7 +2956,7 @@ func (s *DockerSuite) TestRunUnshareProc(c *testing.T) { |
2956 | 2956 |
/* Ensure still fails if running privileged with the default policy */ |
2957 | 2957 |
go func() { |
2958 | 2958 |
name := "crashoverride" |
2959 |
- out, _, err := dockerCmdWithError("run", "--privileged", "--security-opt", "seccomp=unconfined", "--security-opt", "apparmor=docker-default", "--name", name, "debian:jessie", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc") |
|
2959 |
+ out, _, err := dockerCmdWithError("run", "--privileged", "--security-opt", "seccomp=unconfined", "--security-opt", "apparmor=docker-default", "--name", name, "debian:buster", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc") |
|
2960 | 2960 |
if err == nil || |
2961 | 2961 |
!(strings.Contains(strings.ToLower(out), "mount: cannot mount none") || |
2962 | 2962 |
strings.Contains(strings.ToLower(out), "permission denied") || |
... | ... |
@@ -873,12 +873,12 @@ func (s *DockerSuite) TestRunTmpfsMountsWithOptions(c *testing.T) { |
873 | 873 |
assert.Assert(c, strings.Contains(out, option)) |
874 | 874 |
} |
875 | 875 |
|
876 |
- // We use debian:jessie as there is no findmnt in busybox. Also the output will be in the format of |
|
876 |
+ // We use debian:buster as there is no findmnt in busybox. Also the output will be in the format of |
|
877 | 877 |
// TARGET PROPAGATION |
878 | 878 |
// /tmp shared |
879 | 879 |
// so we only capture `shared` here. |
880 | 880 |
expectedOptions = []string{"shared"} |
881 |
- out, _ = dockerCmd(c, "run", "--tmpfs", "/tmp:shared", "debian:jessie", "findmnt", "-o", "TARGET,PROPAGATION", "/tmp") |
|
881 |
+ out, _ = dockerCmd(c, "run", "--tmpfs", "/tmp:shared", "debian:buster", "findmnt", "-o", "TARGET,PROPAGATION", "/tmp") |
|
882 | 882 |
for _, option := range expectedOptions { |
883 | 883 |
assert.Assert(c, strings.Contains(out, option)) |
884 | 884 |
} |
... | ... |
@@ -914,7 +914,7 @@ func (s *DockerSuite) TestRunSysctls(c *testing.T) { |
914 | 914 |
}) |
915 | 915 |
} |
916 | 916 |
|
917 |
-// TestRunSeccompProfileDenyUnshare checks that 'docker run --security-opt seccomp=/tmp/profile.json debian:jessie unshare' exits with operation not permitted. |
|
917 |
+// TestRunSeccompProfileDenyUnshare checks that 'docker run --security-opt seccomp=/tmp/profile.json debian:buster unshare' exits with operation not permitted. |
|
918 | 918 |
func (s *DockerSuite) TestRunSeccompProfileDenyUnshare(c *testing.T) { |
919 | 919 |
testRequires(c, testEnv.IsLocalDaemon, seccompEnabled, NotArm, Apparmor) |
920 | 920 |
jsonData := `{ |
... | ... |
@@ -937,7 +937,7 @@ func (s *DockerSuite) TestRunSeccompProfileDenyUnshare(c *testing.T) { |
937 | 937 |
} |
938 | 938 |
icmd.RunCommand(dockerBinary, "run", "--security-opt", "apparmor=unconfined", |
939 | 939 |
"--security-opt", "seccomp="+tmpFile.Name(), |
940 |
- "debian:jessie", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc").Assert(c, icmd.Expected{ |
|
940 |
+ "debian:buster", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc").Assert(c, icmd.Expected{ |
|
941 | 941 |
ExitCode: 1, |
942 | 942 |
Err: "Operation not permitted", |
943 | 943 |
}) |
... | ... |
@@ -977,7 +977,7 @@ func (s *DockerSuite) TestRunSeccompProfileDenyChmod(c *testing.T) { |
977 | 977 |
}) |
978 | 978 |
} |
979 | 979 |
|
980 |
-// TestRunSeccompProfileDenyUnshareUserns checks that 'docker run debian:jessie unshare --map-root-user --user sh -c whoami' with a specific profile to |
|
980 |
+// TestRunSeccompProfileDenyUnshareUserns checks that 'docker run debian:buster unshare --map-root-user --user sh -c whoami' with a specific profile to |
|
981 | 981 |
// deny unshare of a userns exits with operation not permitted. |
982 | 982 |
func (s *DockerSuite) TestRunSeccompProfileDenyUnshareUserns(c *testing.T) { |
983 | 983 |
testRequires(c, testEnv.IsLocalDaemon, seccompEnabled, NotArm, Apparmor) |
... | ... |
@@ -1009,7 +1009,7 @@ func (s *DockerSuite) TestRunSeccompProfileDenyUnshareUserns(c *testing.T) { |
1009 | 1009 |
} |
1010 | 1010 |
icmd.RunCommand(dockerBinary, "run", |
1011 | 1011 |
"--security-opt", "apparmor=unconfined", "--security-opt", "seccomp="+tmpFile.Name(), |
1012 |
- "debian:jessie", "unshare", "--map-root-user", "--user", "sh", "-c", "whoami").Assert(c, icmd.Expected{ |
|
1012 |
+ "debian:buster", "unshare", "--map-root-user", "--user", "sh", "-c", "whoami").Assert(c, icmd.Expected{ |
|
1013 | 1013 |
ExitCode: 1, |
1014 | 1014 |
Err: "Operation not permitted", |
1015 | 1015 |
}) |
... | ... |
@@ -1061,12 +1061,12 @@ func (s *DockerSuite) TestRunSeccompProfileAllow32Bit(c *testing.T) { |
1061 | 1061 |
icmd.RunCommand(dockerBinary, "run", "syscall-test", "exit32-test").Assert(c, icmd.Success) |
1062 | 1062 |
} |
1063 | 1063 |
|
1064 |
-// TestRunSeccompAllowSetrlimit checks that 'docker run debian:jessie ulimit -v 1048510' succeeds. |
|
1064 |
+// TestRunSeccompAllowSetrlimit checks that 'docker run debian:buster ulimit -v 1048510' succeeds. |
|
1065 | 1065 |
func (s *DockerSuite) TestRunSeccompAllowSetrlimit(c *testing.T) { |
1066 | 1066 |
testRequires(c, testEnv.IsLocalDaemon, seccompEnabled) |
1067 | 1067 |
|
1068 | 1068 |
// ulimit uses setrlimit, so we want to make sure we don't break it |
1069 |
- icmd.RunCommand(dockerBinary, "run", "debian:jessie", "bash", "-c", "ulimit -v 1048510").Assert(c, icmd.Success) |
|
1069 |
+ icmd.RunCommand(dockerBinary, "run", "debian:buster", "bash", "-c", "ulimit -v 1048510").Assert(c, icmd.Success) |
|
1070 | 1070 |
} |
1071 | 1071 |
|
1072 | 1072 |
func (s *DockerSuite) TestRunSeccompDefaultProfileAcct(c *testing.T) { |
... | ... |
@@ -1362,7 +1362,7 @@ func (s *DockerSuite) TestRunApparmorProcDirectory(c *testing.T) { |
1362 | 1362 |
func (s *DockerSuite) TestRunSeccompWithDefaultProfile(c *testing.T) { |
1363 | 1363 |
testRequires(c, testEnv.IsLocalDaemon, seccompEnabled) |
1364 | 1364 |
|
1365 |
- out, _, err := dockerCmdWithError("run", "--security-opt", "seccomp=../profiles/seccomp/default.json", "debian:jessie", "unshare", "--map-root-user", "--user", "sh", "-c", "whoami") |
|
1365 |
+ out, _, err := dockerCmdWithError("run", "--security-opt", "seccomp=../profiles/seccomp/default.json", "debian:buster", "unshare", "--map-root-user", "--user", "sh", "-c", "whoami") |
|
1366 | 1366 |
assert.ErrorContains(c, err, "", out) |
1367 | 1367 |
assert.Equal(c, strings.TrimSpace(out), "unshare: unshare failed: Operation not permitted") |
1368 | 1368 |
} |
... | ... |
@@ -49,7 +49,7 @@ func ensureSyscallTest(c *testing.T) { |
49 | 49 |
|
50 | 50 |
dockerFile := filepath.Join(tmp, "Dockerfile") |
51 | 51 |
content := []byte(` |
52 |
- FROM debian:jessie |
|
52 |
+ FROM debian:buster |
|
53 | 53 |
COPY . /usr/bin/ |
54 | 54 |
`) |
55 | 55 |
err = ioutil.WriteFile(dockerFile, content, 0600) |
... | ... |
@@ -65,7 +65,7 @@ func ensureSyscallTest(c *testing.T) { |
65 | 65 |
} |
66 | 66 |
|
67 | 67 |
func ensureSyscallTestBuild(c *testing.T) { |
68 |
- err := load.FrozenImagesLinux(testEnv.APIClient(), "buildpack-deps:jessie") |
|
68 |
+ err := load.FrozenImagesLinux(testEnv.APIClient(), "buildpack-deps:buster") |
|
69 | 69 |
assert.NilError(c, err) |
70 | 70 |
|
71 | 71 |
var buildArgs []string |
... | ... |
@@ -103,7 +103,7 @@ func ensureNNPTest(c *testing.T) { |
103 | 103 |
|
104 | 104 |
dockerfile := filepath.Join(tmp, "Dockerfile") |
105 | 105 |
content := ` |
106 |
- FROM debian:jessie |
|
106 |
+ FROM debian:buster |
|
107 | 107 |
COPY . /usr/bin |
108 | 108 |
RUN chmod +s /usr/bin/nnp-test |
109 | 109 |
` |
... | ... |
@@ -120,7 +120,7 @@ func ensureNNPTest(c *testing.T) { |
120 | 120 |
} |
121 | 121 |
|
122 | 122 |
func ensureNNPTestBuild(c *testing.T) { |
123 |
- err := load.FrozenImagesLinux(testEnv.APIClient(), "buildpack-deps:jessie") |
|
123 |
+ err := load.FrozenImagesLinux(testEnv.APIClient(), "buildpack-deps:buster") |
|
124 | 124 |
assert.NilError(c, err) |
125 | 125 |
|
126 | 126 |
var buildArgs []string |
... | ... |
@@ -71,7 +71,7 @@ func TestNetworkLoopbackNat(t *testing.T) { |
71 | 71 |
client := testEnv.APIClient() |
72 | 72 |
ctx := context.Background() |
73 | 73 |
|
74 |
- cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:"+serverContainerID)) |
|
74 |
+ cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 1 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:"+serverContainerID)) |
|
75 | 75 |
|
76 | 76 |
poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond)) |
77 | 77 |
|
... | ... |
@@ -31,5 +31,5 @@ func TestDaemonDNSFallback(t *testing.T) { |
31 | 31 |
cid := container.Run(ctx, t, c, container.WithNetworkMode("test"), container.WithCmd("nslookup", "docker.com")) |
32 | 32 |
defer c.ContainerRemove(ctx, cid, types.ContainerRemoveOptions{Force: true}) |
33 | 33 |
|
34 |
- poll.WaitOn(t, container.IsSuccessful(ctx, c, cid), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(4*time.Second)) |
|
34 |
+ poll.WaitOn(t, container.IsSuccessful(ctx, c, cid), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(10*time.Second)) |
|
35 | 35 |
} |
... | ... |
@@ -10,7 +10,7 @@ import ( |
10 | 10 |
"gotest.tools/v3/assert" |
11 | 11 |
) |
12 | 12 |
|
13 |
-var frozenImages = []string{"busybox:latest", "busybox:glibc", "hello-world:frozen", "debian:jessie"} |
|
13 |
+var frozenImages = []string{"busybox:latest", "busybox:glibc", "hello-world:frozen", "debian:buster"} |
|
14 | 14 |
|
15 | 15 |
type protectedElements struct { |
16 | 16 |
containers map[string]struct{} |