mirror of https://github.com/docker/docs.git
				
				
				
			Merge pull request #26874 from mlaventure/1.12.2-vendor-containerd
Vendor in containerd
This commit is contained in:
		
						commit
						38aa258343
					
				|  | @ -253,7 +253,7 @@ RUN set -x \ | |||
| 	&& rm -rf "$GOPATH" | ||||
| 
 | ||||
| # Install containerd | ||||
| ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 | ||||
| ENV CONTAINERD_COMMIT v0.2.4 | ||||
| RUN set -x \ | ||||
| 	&& export GOPATH="$(mktemp -d)" \ | ||||
| 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ | ||||
|  |  | |||
|  | @ -192,7 +192,7 @@ RUN set -x \ | |||
| 	&& rm -rf "$GOPATH" | ||||
| 
 | ||||
| # Install containerd | ||||
| ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 | ||||
| ENV CONTAINERD_COMMIT v0.2.4 | ||||
| RUN set -x \ | ||||
| 	&& export GOPATH="$(mktemp -d)" \ | ||||
| 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ | ||||
|  |  | |||
|  | @ -200,7 +200,7 @@ RUN set -x \ | |||
| 	&& rm -rf "$GOPATH" | ||||
| 
 | ||||
| # Install containerd | ||||
| ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 | ||||
| ENV CONTAINERD_COMMIT v0.2.4 | ||||
| RUN set -x \ | ||||
| 	&& export GOPATH="$(mktemp -d)" \ | ||||
| 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ | ||||
|  |  | |||
|  | @ -85,7 +85,7 @@ RUN set -x \ | |||
| 	&& rm -rf "$GOPATH" | ||||
| 
 | ||||
| # Install containerd | ||||
| ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 | ||||
| ENV CONTAINERD_COMMIT v0.2.4 | ||||
| RUN set -x \ | ||||
| 	&& export GOPATH="$(mktemp -d)" \ | ||||
| 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ | ||||
|  |  | |||
|  | @ -215,7 +215,7 @@ RUN set -x \ | |||
| 	&& rm -rf "$GOPATH" | ||||
| 
 | ||||
| # Install containerd | ||||
| ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 | ||||
| ENV CONTAINERD_COMMIT v0.2.4 | ||||
| RUN set -x \ | ||||
| 	&& export GOPATH="$(mktemp -d)" \ | ||||
| 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ | ||||
|  |  | |||
|  | @ -208,7 +208,7 @@ RUN set -x \ | |||
| 	&& rm -rf "$GOPATH" | ||||
| 
 | ||||
| # Install containerd | ||||
| ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 | ||||
| ENV CONTAINERD_COMMIT v0.2.4 | ||||
| RUN set -x \ | ||||
| 	&& export GOPATH="$(mktemp -d)" \ | ||||
| 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ | ||||
|  |  | |||
|  | @ -68,7 +68,7 @@ RUN set -x \ | |||
| 	&& rm -rf "$GOPATH" | ||||
| 
 | ||||
| # Install containerd | ||||
| ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267 | ||||
| ENV CONTAINERD_COMMIT v0.2.4 | ||||
| RUN set -x \ | ||||
| 	&& export GOPATH="$(mktemp -d)" \ | ||||
| 	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \ | ||||
|  |  | |||
|  | @ -136,7 +136,7 @@ clone git google.golang.org/cloud dae7e3d993bc3812a2185af60552bb6b847e52a0 https | |||
| clone git github.com/docker/docker-credential-helpers v0.3.0 | ||||
| 
 | ||||
| # containerd | ||||
| clone git github.com/docker/containerd 0ac3cd1be170d180b2baed755e8f0da547ceb267 | ||||
| clone git github.com/docker/containerd v0.2.4 | ||||
| 
 | ||||
| # cluster | ||||
| clone git github.com/docker/swarmkit bfbec9f2b6a487100a80027f6ee16cc0c646a8f5 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue