daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update docker image 

Use dmcgowan/docker-integration until can push to distribution namespace

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
master
Derek McGowan 2015-05-28 15:55:04 -07:00
parent 4ebd6b7e1d
commit b39e6395fd
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/docker-integration/Dockerfile
View File

@ -1,5 +1,7 @@
FROM debian:jessie FROM debian:jessie
MAINTAINER Docker Distribution Team <distribution@docker.com>
# compile and runtime deps # compile and runtime deps
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
RUN apt-get update && apt-get install -y --no-install-recommends \ 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 \ RUN curl -L -o /dind https://raw.githubusercontent.com/docker/docker/master/hack/dind \
&& chmod +x /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 # Install bats
RUN cd /usr/local/src/ \ RUN cd /usr/local/src/ \
&& git clone https://github.com/sstephenson/bats.git \ && git clone https://github.com/sstephenson/bats.git \

3
contrib/docker-integration/run.sh
View File

@ -15,8 +15,7 @@ fi
INTEGRATION_IMAGE=${INTEGRATION_IMAGE:-distribution/docker-integration} INTEGRATION_IMAGE=${INTEGRATION_IMAGE:-distribution/docker-integration}
# Make sure we upgrade the integration environment. # 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. # Start the integration tests in a Docker container.
ID=$(docker run -d -t --privileged $volumeMount \ ID=$(docker run -d -t --privileged $volumeMount \