From 589c8a879fea758007a36bd0f00d07aa1000d0cb Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 26 Jan 2016 11:51:22 -0800 Subject: [PATCH] Update notary to 1.10-3 in all Dockerfiles Signed-off-by: Sebastiaan van Stijn --- Dockerfile.aarch64 | 4 ++-- Dockerfile.armhf | 2 +- Dockerfile.ppc64le | 4 ++-- Dockerfile.s390x | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index b0eb704c92..1d7d56fa50 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -110,11 +110,11 @@ RUN set -x \ && rm -rf "$GOPATH" # Install notary server -ENV NOTARY_COMMIT 0c11a970826e62479379ccc75a45184460b9200f +ENV NOTARY_VERSION docker-v1.10-3 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") \ + && (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION") \ && 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" diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 1bef8ecbcb..fab175de9d 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -144,7 +144,7 @@ RUN set -x \ && rm -rf "$GOPATH" # Install notary server -ENV NOTARY_VERSION docker-v1.10-2 +ENV NOTARY_VERSION docker-v1.10-3 RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \ diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le index dac1878974..a457ae3f50 100644 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -123,11 +123,11 @@ RUN set -x \ # TODO update this when we upgrade to Go 1.5.1+ # Install notary server -#ENV NOTARY_COMMIT 8e8122eb5528f621afcd4e2854c47302f17392f7 +#ENV NOTARY_VERSION docker-v1.10-3 #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") \ +# && (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION") \ # && 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" diff --git a/Dockerfile.s390x b/Dockerfile.s390x index fdee716c9e..eac8e71db4 100644 --- a/Dockerfile.s390x +++ b/Dockerfile.s390x @@ -116,11 +116,11 @@ RUN set -x \ && rm -rf "$GOPATH" # Install notary server -ENV NOTARY_COMMIT 8e8122eb5528f621afcd4e2854c47302f17392f7 +ENV NOTARY_VERSION docker-v1.10-3 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") \ + && (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION") \ && 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"