@@ -104,26 +104,33 @@ RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint

 	&& (cd /go/src/github.com/golang/lint && git checkout -q $GO_LINT_COMMIT) \

 	&& go install -v github.com/golang/lint/golint

-

-# Install registry

-ENV REGISTRY_COMMIT ec87e9b6971d831f0eff752ddb54fb64693e51cd

+# Install two versions of the registry. The first is an older version that

+# only supports schema1 manifests. The second is a newer version that supports

+# both. This allows integration-cli tests to cover push/pull with both schema1

+# and schema2 manifests.

+ENV REGISTRY_COMMIT_SCHEMA1 ec87e9b6971d831f0eff752ddb54fb64693e51cd

+ENV REGISTRY_COMMIT a7ae88da459b98b481a245e5b1750134724ac67d

 RUN set -x \

 	&& export GOPATH="$(mktemp -d)" \

 	&& git clone https://github.com/docker/distribution.git "$GOPATH/src/github.com/docker/distribution" \

 	&& (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT") \

 	&& GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \

 		go build -o /usr/local/bin/registry-v2 github.com/docker/distribution/cmd/registry \

+	&& (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT_SCHEMA1") \

+	&& GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \

+		go build -o /usr/local/bin/registry-v2-schema1 github.com/docker/distribution/cmd/registry \

 	&& rm -rf "$GOPATH"

+# TODO update this when we upgrade to Go 1.5.1+

 # Install notary server

-ENV NOTARY_COMMIT 8e8122eb5528f621afcd4e2854c47302f17392f7

-RUN set -x \

-	&& export GOPATH="$(mktemp -d)" \

-	&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \

-	&& (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_COMMIT") \

-	&& GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \

-		go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \

-	&& rm -rf "$GOPATH"

+#ENV NOTARY_COMMIT 8e8122eb5528f621afcd4e2854c47302f17392f7

+#RUN set -x \

+#	&& export GOPATH="$(mktemp -d)" \

+#	&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \

+#	&& (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_COMMIT") \

+#	&& GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \

+#		go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \

+#	&& rm -rf "$GOPATH"

 # Get the "docker-py" source so we can run their integration tests

 ENV DOCKER_PY_COMMIT e2878cbcc3a7eef99917adc1be252800b0e41ece