Update docker image
Use dmcgowan/docker-integration until can push to distribution namespace Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)master
							parent
							
								
									4ebd6b7e1d
								
							
						
					
					
						commit
						b39e6395fd
					
				|  | @ -1,5 +1,7 @@ | |||
| FROM debian:jessie | ||||
| 
 | ||||
| MAINTAINER Docker Distribution Team <distribution@docker.com> | ||||
| 
 | ||||
| # compile and runtime deps | ||||
| # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies | ||||
| RUN apt-get update && apt-get install -y --no-install-recommends \ | ||||
|  | @ -26,17 +28,6 @@ RUN curl -L -o /usr/local/bin/docker https://test.docker.com/builds/Linux/x86_64 | |||
| RUN curl -L -o /dind https://raw.githubusercontent.com/docker/docker/master/hack/dind \ | ||||
|     && chmod +x /dind | ||||
| 
 | ||||
| # Install golang | ||||
| ENV GO_VERSION 1.4.2 | ||||
| RUN curl -sSL https://golang.org/dl/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/local -xz \ | ||||
|     && mkdir -p /go/bin | ||||
| ENV PATH /go/bin:/usr/local/go/bin:$PATH | ||||
| ENV GOPATH /go | ||||
| RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1 | ||||
| 
 | ||||
| # Go dependencies | ||||
| RUN go get github.com/tools/godep | ||||
| 
 | ||||
| # Install bats | ||||
| RUN cd /usr/local/src/ \ | ||||
|     && git clone https://github.com/sstephenson/bats.git \ | ||||
|  |  | |||
|  | @ -15,8 +15,7 @@ fi | |||
| INTEGRATION_IMAGE=${INTEGRATION_IMAGE:-distribution/docker-integration} | ||||
| 
 | ||||
| # Make sure we upgrade the integration environment. | ||||
| # Not yet on hub, run `docker build -t distribution/docker-integration .` | ||||
| #docker pull $INTEGRATION_IMAGE | ||||
| docker pull $INTEGRATION_IMAGE | ||||
| 
 | ||||
| # Start the integration tests in a Docker container. | ||||
| ID=$(docker run -d -t --privileged $volumeMount \ | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue