diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-10-09 15:26:01 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-10-09 15:26:01 -0700 |
| commit | 423cce4caf1c39c7ac42f0a9596ca362119bd320 (patch) | |
| tree | 6f9ec73f5265680d9f306e9fd64095264cc501a9 | |
| parent | cdb5f435dfcfb540af13a5243b25661417ad124e (diff) | |
| parent | 0221ecbdfda51cf2f4e081be9a520bf210723182 (diff) | |
Merge pull request #3702 from nicolasnoble/docker-inception
Trying to allow docker-within-docker.
| -rw-r--r-- | tools/jenkins/grpc_jenkins_slave/Dockerfile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/jenkins/grpc_jenkins_slave/Dockerfile b/tools/jenkins/grpc_jenkins_slave/Dockerfile index 5f2b425c8c..129a8db24f 100644 --- a/tools/jenkins/grpc_jenkins_slave/Dockerfile +++ b/tools/jenkins/grpc_jenkins_slave/Dockerfile @@ -157,6 +157,12 @@ RUN apt-get update && apt-get install -y \ RUN apt-get install -y libzookeeper-mt-dev +################## +# Docker "inception". +# Note this is quite the ugly hack. +# This makes sure that the docker binary we inject has its dependencies. +RUN curl https://get.docker.com/ | sh +RUN apt-get remove --purge -y docker-engine RUN mkdir /var/local/jenkins |