aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-02-10 16:04:26 -0800
committerGravatar Craig Tiller <ctiller@google.com>2016-02-10 16:04:26 -0800
commitf6fd7ec8a0820606ed7f7d0ca23bbe4e8bac0fea (patch)
tree924335f3cea1b72ada0e796d5bd654c31f1fb5a5
parent203041148a9e2510b5cad6c038dc53bab0741ac2 (diff)
Fix docker inception for now
-rw-r--r--templates/tools/dockerfile/test/sanity/Dockerfile.template1
-rw-r--r--tools/dockerfile/test/sanity/Dockerfile1
2 files changed, 2 insertions, 0 deletions
diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template
index bbdb848599..ad1d92e7cb 100644
--- a/templates/tools/dockerfile/test/sanity/Dockerfile.template
+++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template
@@ -41,6 +41,7 @@
# Docker "inception"
# Note this is quite the ugly hack.
# This makes sure that the docker binary we inject has its dependencies.
+ RUN apt-get install libsystemd-journal0
RUN curl https://get.docker.com/ | sh
RUN apt-get remove --purge -y docker-engine
diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile
index 51ee49b448..1935f67560 100644
--- a/tools/dockerfile/test/sanity/Dockerfile
+++ b/tools/dockerfile/test/sanity/Dockerfile
@@ -72,6 +72,7 @@ RUN pip install simplejson mako
# Docker "inception"
# Note this is quite the ugly hack.
# This makes sure that the docker binary we inject has its dependencies.
+RUN apt-get install libsystemd-journal0
RUN curl https://get.docker.com/ | sh
RUN apt-get remove --purge -y docker-engine