mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
58738cdee3
This fix is a follow up for comment https://github.com/docker/docker/pull/28535#issuecomment-263215225 This fix provides `--filter until=<timestamp>` for `docker container/image prune`. This fix adds `--filter until=<timestamp>` to `docker container/image prune` so that it is possible to specify a timestamp and prune those containers/images that are earlier than the timestamp. Related docs has been updated Several integration tests have been added to cover changes. This fix fixes #28497. This fix is related to #28535. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
113 lines
3.7 KiB
Go
113 lines
3.7 KiB
Go
// +build !windows
|
|
|
|
package main
|
|
|
|
import (
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/docker/docker/integration-cli/checker"
|
|
"github.com/docker/docker/integration-cli/daemon"
|
|
"github.com/go-check/check"
|
|
)
|
|
|
|
func pruneNetworkAndVerify(c *check.C, d *daemon.Swarm, kept, pruned []string) {
|
|
_, err := d.Cmd("network", "prune", "--force")
|
|
c.Assert(err, checker.IsNil)
|
|
out, err := d.Cmd("network", "ls", "--format", "{{.Name}}")
|
|
c.Assert(err, checker.IsNil)
|
|
for _, s := range kept {
|
|
c.Assert(out, checker.Contains, s)
|
|
}
|
|
for _, s := range pruned {
|
|
c.Assert(out, checker.Not(checker.Contains), s)
|
|
}
|
|
}
|
|
|
|
func (s *DockerSwarmSuite) TestPruneNetwork(c *check.C) {
|
|
d := s.AddDaemon(c, true, true)
|
|
_, err := d.Cmd("network", "create", "n1") // used by container (testprune)
|
|
c.Assert(err, checker.IsNil)
|
|
_, err = d.Cmd("network", "create", "n2")
|
|
c.Assert(err, checker.IsNil)
|
|
_, err = d.Cmd("network", "create", "n3", "--driver", "overlay") // used by service (testprunesvc)
|
|
c.Assert(err, checker.IsNil)
|
|
_, err = d.Cmd("network", "create", "n4", "--driver", "overlay")
|
|
c.Assert(err, checker.IsNil)
|
|
|
|
cName := "testprune"
|
|
_, err = d.Cmd("run", "-d", "--name", cName, "--net", "n1", "busybox", "top")
|
|
c.Assert(err, checker.IsNil)
|
|
|
|
serviceName := "testprunesvc"
|
|
replicas := 1
|
|
out, err := d.Cmd("service", "create", "--name", serviceName,
|
|
"--replicas", strconv.Itoa(replicas),
|
|
"--network", "n3",
|
|
"busybox", "top")
|
|
c.Assert(err, checker.IsNil)
|
|
c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
|
|
waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, replicas+1)
|
|
|
|
// prune and verify
|
|
pruneNetworkAndVerify(c, d, []string{"n1", "n3"}, []string{"n2", "n4"})
|
|
|
|
// remove containers, then prune and verify again
|
|
_, err = d.Cmd("rm", "-f", cName)
|
|
c.Assert(err, checker.IsNil)
|
|
_, err = d.Cmd("service", "rm", serviceName)
|
|
c.Assert(err, checker.IsNil)
|
|
waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, 0)
|
|
pruneNetworkAndVerify(c, d, []string{}, []string{"n1", "n3"})
|
|
}
|
|
|
|
func (s *DockerDaemonSuite) TestPruneImageDangling(c *check.C) {
|
|
s.d.StartWithBusybox(c)
|
|
|
|
out, _, err := s.d.BuildImageWithOut("test",
|
|
`FROM busybox
|
|
LABEL foo=bar`, true, "-q")
|
|
c.Assert(err, checker.IsNil)
|
|
id := strings.TrimSpace(out)
|
|
|
|
out, err = s.d.Cmd("images", "-q", "--no-trunc")
|
|
c.Assert(err, checker.IsNil)
|
|
c.Assert(strings.TrimSpace(out), checker.Contains, id)
|
|
|
|
out, err = s.d.Cmd("image", "prune", "--force")
|
|
c.Assert(err, checker.IsNil)
|
|
c.Assert(strings.TrimSpace(out), checker.Not(checker.Contains), id)
|
|
|
|
out, err = s.d.Cmd("images", "-q", "--no-trunc")
|
|
c.Assert(err, checker.IsNil)
|
|
c.Assert(strings.TrimSpace(out), checker.Contains, id)
|
|
|
|
out, err = s.d.Cmd("image", "prune", "--force", "--all")
|
|
c.Assert(err, checker.IsNil)
|
|
c.Assert(strings.TrimSpace(out), checker.Contains, id)
|
|
|
|
out, err = s.d.Cmd("images", "-q", "--no-trunc")
|
|
c.Assert(err, checker.IsNil)
|
|
c.Assert(strings.TrimSpace(out), checker.Not(checker.Contains), id)
|
|
}
|
|
|
|
func (s *DockerSuite) TestPruneContainerUntil(c *check.C) {
|
|
out, _ := dockerCmd(c, "run", "-d", "busybox")
|
|
id1 := strings.TrimSpace(out)
|
|
c.Assert(waitExited(id1, 5*time.Second), checker.IsNil)
|
|
|
|
until := daemonUnixTime(c)
|
|
|
|
out, _ = dockerCmd(c, "run", "-d", "busybox")
|
|
id2 := strings.TrimSpace(out)
|
|
c.Assert(waitExited(id2, 5*time.Second), checker.IsNil)
|
|
|
|
out, _ = dockerCmd(c, "container", "prune", "--force", "--filter", "until="+until)
|
|
c.Assert(strings.TrimSpace(out), checker.Contains, id1)
|
|
c.Assert(strings.TrimSpace(out), checker.Not(checker.Contains), id2)
|
|
|
|
out, _ = dockerCmd(c, "ps", "-a", "-q", "--no-trunc")
|
|
c.Assert(strings.TrimSpace(out), checker.Not(checker.Contains), id1)
|
|
c.Assert(strings.TrimSpace(out), checker.Contains, id2)
|
|
}
|