registry: update to v3

docs/ctlptl_create_registry.md

@@ -19,7 +19,7 @@ ctlptl create registry [name] [flags]
 ```
       --allow-missing-template-keys   If true, ignore any errors in templates when a field or map key is missing in the template. Only applies to golang and jsonpath output formats. (default true)
   -h, --help                          help for registry
-      --image string                  Registry image to use (default "docker.io/library/registry:2")
+      --image string                  Registry image to use (default "docker.io/library/registry:3")
       --listen-address string         The host's IP address to bind the container to. If not set defaults to 127.0.0.1
   -o, --output string                 Output format. One of: (json, yaml, kyaml, name, go-template, go-template-file, template, templatefile, jsonpath, jsonpath-as-json, jsonpath-file).
       --port int                      The port to expose the registry on host. If not specified, chooses a random port

pkg/api/types.go

@@ -218,7 +218,7 @@ type Registry struct {
 	// Can be used to provide an alternate image or use a different registry
 	// than Docker Hub.
 	//
-	// Defaults to `docker.io/library/registry:2`.
+	// Defaults to `docker.io/library/registry:3`.
 	Image string `json:"image,omitempty" yaml:"image,omitempty"`
 
 	// Most recently observed status of the registry.

pkg/registry/registry.go

@@ -33,7 +33,7 @@ var (
 	groupResource = schema.GroupResource{Group: "ctlptl.dev", Resource: "registries"}
 )
 
-const DefaultRegistryImageRef = "docker.io/library/registry:2" // The registry everyone uses.
+const DefaultRegistryImageRef = "docker.io/library/registry:3" // The registry everyone uses.
 
 // https://github.com/moby/moby/blob/v20.10.3/api/types/types.go#L313
 const containerStateRunning = "running"

pkg/registry/registry_test.go

@@ -27,7 +27,7 @@ func kindRegistry() container.Summary {
 		Names:   []string{"/kind-registry"},
 		Image:   DefaultRegistryImageRef,
 		ImageID: "sha256:2d4f4b5309b1e41b4f83ae59b44df6d673ef44433c734b14c1c103ebca82c116",
-		Command: "/entrypoint.sh /etc/docker/registry/config.yml",
+		Command: "registry serve /etc/distribution/config.yml",
 		Created: 1603483645,
 		Labels:  map[string]string{"dev.tilt.ctlptl.role": "registry"},
 		Ports: []container.PortSummary{
@@ -56,7 +56,7 @@ func kindRegistryLoopback() container.Summary {
 		Names:   []string{"/kind-registry-loopback"},
 		Image:   DefaultRegistryImageRef,
 		ImageID: "sha256:2d4f4b5309b1e41b4f83ae59b44df6d673ef44433c734b14c1c103ebca82c116",
-		Command: "/entrypoint.sh /etc/docker/registry/config.yml",
+		Command: "registry serve /etc/distribution/config.yml",
 		Created: 1603483646,
 		Labels:  map[string]string{"dev.tilt.ctlptl.role": "registry"},
 		Ports: []container.PortSummary{
@@ -85,7 +85,7 @@ func kindRegistryCustomImage() container.Summary {
 		Names:   []string{"/kind-registry-custom-image"},
 		Image:   "fake.tilt.dev/my-registry-image:latest",
 		ImageID: "sha256:0ac33e5f5afa79e084075e8698a22d574816eea8d7b7d480586835657c3e1c8b",
-		Command: "/entrypoint.sh /etc/docker/registry/config.yml",
+		Command: "registry serve /etc/distribution/config.yml",
 		Created: 1603483647,
 		Labels:  map[string]string{"dev.tilt.ctlptl.role": "registry"},
 		Ports: []container.PortSummary{
@@ -114,7 +114,7 @@ func registryBadPorts() container.Summary {
 		Names:   []string{"/kind-registry"},
 		Image:   DefaultRegistryImageRef,
 		ImageID: "sha256:2d4f4b5309b1e41b4f83ae59b44df6d673ef44433c734b14c1c103ebca82c116",
-		Command: "/entrypoint.sh /etc/docker/registry/config.yml",
+		Command: "registry serve /etc/distribution/config.yml",
 		Created: 1603483645,
 		Labels:  map[string]string{"dev.tilt.ctlptl.role": "registry"},
 		Ports: []container.PortSummary{
@@ -509,13 +509,13 @@ func (d *fakeDocker) ContainerInspect(ctx context.Context, containerID string, o
 						OpenStdin:   false,
 						StdinOnce:   false,
 						Env:         []string{"REGISTRY_STORAGE_DELETE_ENABLED=true", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"},
-						Cmd:         []string{"/etc/docker/registry/config.yml"},
+						Cmd:         []string{"serve", "/etc/distribution/config.yml"},
 						Healthcheck: (*container.HealthConfig)(nil),
 						ArgsEscaped: false,
 						Image:       DefaultRegistryImageRef,
 						Volumes:     map[string]struct{}{"/var/lib/registry": struct{}{}},
 						WorkingDir:  "",
-						Entrypoint:  []string{"/entrypoint.sh"},
+						Entrypoint:  []string{"registry"},
 						// NetworkDisabled: false,
 						OnBuild:     []string(nil),
 						Labels:      map[string]string{"dev.tilt.ctlptl.role": "registry"},