aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/dockerfile/test
diff options
context:
space:
mode:
authorGravatar murgatroid99 <mlumish@google.com>2016-10-12 09:54:49 -0700
committerGravatar murgatroid99 <mlumish@google.com>2016-10-12 10:59:59 -0700
commit22d50e98d8dbff93a7221cd705130b1192c34ffa (patch)
tree0b04f38c9d8525e49915840b8cfa5233be277752 /tools/dockerfile/test
parent1687cab9ed8b286f78db1f11b1baa0094b236d83 (diff)
Fix sanity and move a header include
Diffstat (limited to 'tools/dockerfile/test')
-rw-r--r--tools/dockerfile/test/cxx_jessie_x64/Dockerfile11
1 files changed, 3 insertions, 8 deletions
diff --git a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile
index b9216571ef..1f6641ac42 100644
--- a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile
+++ b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile
@@ -115,14 +115,6 @@ RUN cd llvm-build && cmake \
../llvm
RUN make -C llvm-build -j 12 && make -C llvm-build install && rm -rf llvm-build
-#================
-# libuv
-RUN cd /tmp \
- && wget http://dist.libuv.org/dist/v1.9.1/libuv-v1.9.1.tar.gz \
- && tar -xf libuv-v1.9.1.tar.gz \
- && cd libuv-v1.9.1 \
- && sh autogen.sh && ./configure --prefix=/usr && make && make install
-
# Prepare ccache
RUN ln -s /usr/bin/ccache /usr/local/bin/gcc
RUN ln -s /usr/bin/ccache /usr/local/bin/g++
@@ -134,5 +126,8 @@ RUN ln -s /usr/bin/ccache /usr/local/bin/clang++
RUN mkdir /var/local/jenkins
+#================
+# libuv
+RUN cd /tmp && wget http://dist.libuv.org/dist/v1.9.1/libuv-v1.9.1.tar.gz && tar -xf libuv-v1.9.1.tar.gz && cd libuv-v1.9.1 && sh autogen.sh && ./configure --prefix=/usr && make && make install
# Define the default command.
CMD ["bash"]