From b39e6395fdd39c4aa279fe9fbc1d40b4cc09ce11 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Thu, 28 May 2015 15:55:04 -0700 Subject: [PATCH] Update docker image Use dmcgowan/docker-integration until can push to distribution namespace Signed-off-by: Derek McGowan (github: dmcgowan) --- contrib/docker-integration/Dockerfile | 13 ++----------- contrib/docker-integration/run.sh | 3 +-- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/contrib/docker-integration/Dockerfile b/contrib/docker-integration/Dockerfile index dc3511c41..37da40581 100644 --- a/contrib/docker-integration/Dockerfile +++ b/contrib/docker-integration/Dockerfile @@ -1,5 +1,7 @@ FROM debian:jessie +MAINTAINER Docker Distribution Team + # 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 \ diff --git a/contrib/docker-integration/run.sh b/contrib/docker-integration/run.sh index bd02b239d..e670db01f 100755 --- a/contrib/docker-integration/run.sh +++ b/contrib/docker-integration/run.sh @@ -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 \