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:22Showing 4 changed files
| ... | ... |
@@ -110,11 +110,11 @@ RUN set -x \ |
| 110 | 110 |
&& rm -rf "$GOPATH" |
| 111 | 111 |
|
| 112 | 112 |
# Install notary server |
| 113 |
-ENV NOTARY_COMMIT 0c11a970826e62479379ccc75a45184460b9200f |
|
| 113 |
+ENV NOTARY_VERSION docker-v1.10-3 |
|
| 114 | 114 |
RUN set -x \ |
| 115 | 115 |
&& export GOPATH="$(mktemp -d)" \ |
| 116 | 116 |
&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \ |
| 117 |
- && (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_COMMIT") \ |
|
| 117 |
+ && (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION") \ |
|
| 118 | 118 |
&& GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \ |
| 119 | 119 |
go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \ |
| 120 | 120 |
&& rm -rf "$GOPATH" |
| ... | ... |
@@ -144,7 +144,7 @@ RUN set -x \ |
| 144 | 144 |
&& rm -rf "$GOPATH" |
| 145 | 145 |
|
| 146 | 146 |
# Install notary server |
| 147 |
-ENV NOTARY_VERSION docker-v1.10-2 |
|
| 147 |
+ENV NOTARY_VERSION docker-v1.10-3 |
|
| 148 | 148 |
RUN set -x \ |
| 149 | 149 |
&& export GOPATH="$(mktemp -d)" \ |
| 150 | 150 |
&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \ |
| ... | ... |
@@ -123,11 +123,11 @@ RUN set -x \ |
| 123 | 123 |
|
| 124 | 124 |
# TODO update this when we upgrade to Go 1.5.1+ |
| 125 | 125 |
# Install notary server |
| 126 |
-#ENV NOTARY_COMMIT 8e8122eb5528f621afcd4e2854c47302f17392f7 |
|
| 126 |
+#ENV NOTARY_VERSION docker-v1.10-3 |
|
| 127 | 127 |
#RUN set -x \ |
| 128 | 128 |
# && export GOPATH="$(mktemp -d)" \ |
| 129 | 129 |
# && git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \ |
| 130 |
-# && (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_COMMIT") \ |
|
| 130 |
+# && (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION") \ |
|
| 131 | 131 |
# && GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \ |
| 132 | 132 |
# go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \ |
| 133 | 133 |
# && rm -rf "$GOPATH" |
| ... | ... |
@@ -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" |