From 1472e90c2b7eb6f6861ad5d3bc21439c36a66725 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 13 Oct 2016 22:10:06 -0400 Subject: [PATCH] build mandatory prerequisites as part of Docker build process --- .dockerignore | 3 +++ Dockerfile | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/.dockerignore b/.dockerignore index 72e8ffc0d..bec958ec2 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,4 @@ * +!thirdparty/libxil/ +!thirdparty/criterion/ +!thirdparty/libwebsockets/ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index c93218039..ecba9af1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,6 +59,21 @@ RUN dnf -y update && \ bison \ texinfo +# Build & Install libxil +COPY thirdparty/libxil /tmp/libxil +RUN mkdir -p /tmp/libxil/build && cd /tmp/libxil/build && cmake .. && make install + +# Build & Install Criterion +COPY thirdparty/criterion /tmp/criterion +RUN mkdir -p /tmp/criterion/build && cd /tmp/criterion/build && cmake .. && make install + +# Build & Install libwebsockets +COPY thirdparty/libwebsockets /tmp/libwebsockets +RUN mkdir -p /tmp/libwebsockets/build && cd /tmp/libwebsockets/build && cmake .. && make install + +# Cleanup intermediate files from builds +RUN rm -rf /tmp + WORKDIR /villas ENTRYPOINT /bin/bash