mirror of
				https://github.com/moby/moby.git
				synced 2022-11-09 12:21:53 -05:00 
			
		
		
		
	Merge pull request #24904 from mlaventure/update-dockerfile-containerd-commit
Harmonize containerd commit used by all Dockerfile
This commit is contained in:
		
						commit
						2b3148c720
					
				
					 6 changed files with 6 additions and 6 deletions
				
			
		| 
						 | 
				
			
			@ -195,7 +195,7 @@ RUN set -x \
 | 
			
		|||
	&& rm -rf "$GOPATH"
 | 
			
		||||
 | 
			
		||||
# Install containerd
 | 
			
		||||
ENV CONTAINERD_COMMIT 90f827ca1066b3b6584ce7450989b96b576b1baf
 | 
			
		||||
ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
 | 
			
		||||
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 90f827ca1066b3b6584ce7450989b96b576b1baf
 | 
			
		||||
ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
 | 
			
		||||
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 90f827ca1066b3b6584ce7450989b96b576b1baf
 | 
			
		||||
ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
 | 
			
		||||
RUN set -x \
 | 
			
		||||
	&& export GOPATH="$(mktemp -d)" \
 | 
			
		||||
	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -213,7 +213,7 @@ RUN set -x \
 | 
			
		|||
	&& rm -rf "$GOPATH"
 | 
			
		||||
 | 
			
		||||
# Install containerd
 | 
			
		||||
ENV CONTAINERD_COMMIT 90f827ca1066b3b6584ce7450989b96b576b1baf
 | 
			
		||||
ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
 | 
			
		||||
RUN set -x \
 | 
			
		||||
	&& export GOPATH="$(mktemp -d)" \
 | 
			
		||||
	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -217,7 +217,7 @@ RUN set -x \
 | 
			
		|||
	&& rm -rf "$GOPATH"
 | 
			
		||||
 | 
			
		||||
# Install containerd
 | 
			
		||||
ENV CONTAINERD_COMMIT 90f827ca1066b3b6584ce7450989b96b576b1baf
 | 
			
		||||
ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
 | 
			
		||||
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 90f827ca1066b3b6584ce7450989b96b576b1baf
 | 
			
		||||
ENV CONTAINERD_COMMIT 0ac3cd1be170d180b2baed755e8f0da547ceb267
 | 
			
		||||
RUN set -x \
 | 
			
		||||
	&& export GOPATH="$(mktemp -d)" \
 | 
			
		||||
	&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue