1. docker
  2. Commit fe8647bc06759446529872d751d48d4444f79442
Browse code

Update notary to 1.10-3 in all Dockerfiles

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2016/01/27 04:51:22
Showing 3 changed files
Dockerfile.armhf
History View file @ fe8647b
... ... 
@@ -145,7 +145,7 @@ RUN set -x \
145 145 
 	&& rm -rf "$GOPATH"
146 146
147 147 
 # Install notary server
148 
-ENV NOTARY_VERSION docker-v1.10-2
148 
+ENV NOTARY_VERSION docker-v1.10-3
149 149 
 RUN set -x \
150 150 
 	&& export GOPATH="$(mktemp -d)" \
151 151 
 	&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \
Dockerfile.ppc64le
History View file @ fe8647b
... ... 
@@ -116,14 +116,14 @@ RUN set -x \
116 116 
 	&& rm -rf "$GOPATH"
117 117
118 118 
 # Install notary server
119 
-ENV NOTARY_COMMIT 8e8122eb5528f621afcd4e2854c47302f17392f7
120 
-RUN set -x \
121 
-	&& export GOPATH="$(mktemp -d)" \
122 
-	&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \
123 
-	&& (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_COMMIT") \
124 
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \
125 
-		go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \
126 
-	&& rm -rf "$GOPATH"
119 
+#ENV NOTARY_VERSION docker-v1.10-3
120 
+#RUN set -x \
121 
+#	&& export GOPATH="$(mktemp -d)" \
122 
+#	&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \
123 
+#	&& (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION") \
124 
+#	&& GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \
125 
+#		go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \
126 
+#	&& rm -rf "$GOPATH"
127 127
128 128 
 # Get the "docker-py" source so we can run their integration tests
129 129 
 ENV DOCKER_PY_COMMIT e2878cbcc3a7eef99917adc1be252800b0e41ece
Dockerfile.s390x
History View file @ fe8647b
... ... 
@@ -116,11 +116,11 @@ RUN set -x \
116 116 
 	&& rm -rf "$GOPATH"
117 117
118 118 
 # Install notary server
119 
-ENV NOTARY_COMMIT 8e8122eb5528f621afcd4e2854c47302f17392f7
119 
+ENV NOTARY_VERSION docker-v1.10-3
120 120 
 RUN set -x \
121 121 
 	&& export GOPATH="$(mktemp -d)" \
122 122 
 	&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \
123 
-	&& (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_COMMIT") \
123 
+	&& (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION") \
124 124 
 	&& GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \
125 125 
 		go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \
126 126 
 	&& rm -rf "$GOPATH"