|
@@ -27,8 +27,8 @@ func makefile(path string, contents string) (string, error) {
|
|
|
// attempt to contact any v1 registry endpoints.
|
|
|
func (s *DockerRegistrySuite) TestV2Only(c *testing.T) {
|
|
|
reg, err := registry.NewMock(c)
|
|
|
- defer reg.Close()
|
|
|
assert.NilError(c, err)
|
|
|
+ defer reg.Close()
|
|
|
|
|
|
reg.RegisterHandler("/v2/", func(w http.ResponseWriter, r *http.Request) {
|
|
|
w.WriteHeader(404)
|
|
@@ -49,11 +49,10 @@ func (s *DockerRegistrySuite) TestV2Only(c *testing.T) {
|
|
|
dockerfileName, err := makefile(tmp, fmt.Sprintf("FROM %s/busybox", reg.URL()))
|
|
|
assert.NilError(c, err, "Unable to create test dockerfile")
|
|
|
|
|
|
- s.d.Cmd("build", "--file", dockerfileName, tmp)
|
|
|
-
|
|
|
- s.d.Cmd("run", repoName)
|
|
|
- s.d.Cmd("login", "-u", "richard", "-p", "testtest", reg.URL())
|
|
|
- s.d.Cmd("tag", "busybox", repoName)
|
|
|
- s.d.Cmd("push", repoName)
|
|
|
- s.d.Cmd("pull", repoName)
|
|
|
+ _, _ = s.d.Cmd("build", "--file", dockerfileName, tmp)
|
|
|
+ _, _ = s.d.Cmd("run", repoName)
|
|
|
+ _, _ = s.d.Cmd("login", "-u", "richard", "-p", "testtest", reg.URL())
|
|
|
+ _, _ = s.d.Cmd("tag", "busybox", repoName)
|
|
|
+ _, _ = s.d.Cmd("push", repoName)
|
|
|
+ _, _ = s.d.Cmd("pull", repoName)
|
|
|
}
|