From 83f8a92e5e8c96bf5376c0c476307cdc2492d356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Fri, 29 Jul 2016 21:16:43 -0400 Subject: [PATCH] travis: add llvm docker build --- .travis.yml | 4 +++- docker/Dockerfile | 6 ++++++ docker/DockerfileDeps | 9 +++++++++ docker/DockerfileDepsLlvm | 11 +++++++++++ docker/DockerfileLlvm | 6 ++++++ Dockerfile => docker/DockerfileTravis | 2 +- docker/DockerfileTravisLlvm | 6 ++++++ 7 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 docker/Dockerfile create mode 100644 docker/DockerfileDeps create mode 100644 docker/DockerfileDepsLlvm create mode 100644 docker/DockerfileLlvm rename Dockerfile => docker/DockerfileTravis (75%) create mode 100644 docker/DockerfileTravisLlvm diff --git a/.travis.yml b/.travis.yml index fb2db830..64ec3eeb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,11 @@ language: cpp before_install: - docker pull aberaud/opendht-deps +- docker pull aberaud/opendht-deps-llvm script: -- docker build . +- docker build -f docker/DockerfileTravis . +- docker build -f docker/DockerfileTravisLlvm . notifications: email: diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 00000000..304510c3 --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,6 @@ +FROM aberaud/opendht-deps +MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com> +RUN git clone https://github.com/savoirfairelinux/opendht.git \ + && cd opendht && mkdir build && cd build \ + && cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make -j8 && make install \ + && cd ../.. && rm -rf opendht \ No newline at end of file diff --git a/docker/DockerfileDeps b/docker/DockerfileDeps new file mode 100644 index 00000000..b17a9927 --- /dev/null +++ b/docker/DockerfileDeps @@ -0,0 +1,9 @@ +FROM ubuntu:16.04 +MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com> +RUN apt-get update && apt-get install -y build-essential cmake git wget libncurses5-dev libreadline-dev nettle-dev libgnutls-dev cython3 python3-dev python3-setuptools +RUN wget https://github.com/msgpack/msgpack-c/releases/download/cpp-1.4.2/msgpack-1.4.2.tar.gz \ + && tar -xzf msgpack-1.4.2.tar.gz \ + && cd msgpack-1.4.2 && mkdir build && cd build \ + && cmake -DMSGPACK_CXX11=ON -DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX=/usr .. \ + && make -j8 && make install \ + && cd ../.. && rm -rf msgpack-1.4.2 diff --git a/docker/DockerfileDepsLlvm b/docker/DockerfileDepsLlvm new file mode 100644 index 00000000..8c8ccf43 --- /dev/null +++ b/docker/DockerfileDepsLlvm @@ -0,0 +1,11 @@ +FROM ubuntu:16.04 +MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com> +RUN apt-get update \ + && apt-get install -y llvm clang make cmake git wget libncurses5-dev libreadline-dev nettle-dev libgnutls-dev cython3 python3-dev python3-setuptools \ + && apt-get remove -y gcc g++ && apt-get autoremove -y && apt-get clean +RUN wget https://github.com/msgpack/msgpack-c/releases/download/cpp-1.4.2/msgpack-1.4.2.tar.gz \ + && tar -xzf msgpack-1.4.2.tar.gz \ + && cd msgpack-1.4.2 && mkdir build && cd build \ + && cmake -DMSGPACK_CXX11=ON -DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX=/usr .. \ + && make -j8 && make install \ + && cd ../.. && rm -rf msgpack-1.4.2 diff --git a/docker/DockerfileLlvm b/docker/DockerfileLlvm new file mode 100644 index 00000000..a66981fd --- /dev/null +++ b/docker/DockerfileLlvm @@ -0,0 +1,6 @@ +FROM aberaud/opendht-deps-llvm +MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com> +RUN git clone https://github.com/savoirfairelinux/opendht.git \ + && cd opendht && mkdir build && cd build \ + && cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make -j8 && make install \ + && cd ../.. && rm -rf opendht \ No newline at end of file diff --git a/Dockerfile b/docker/DockerfileTravis similarity index 75% rename from Dockerfile rename to docker/DockerfileTravis index 51e93acb..c810ba71 100644 --- a/Dockerfile +++ b/docker/DockerfileTravis @@ -2,5 +2,5 @@ FROM aberaud/opendht-deps MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com> COPY . /root/opendht RUN cd /root/opendht && mkdir build && cd build \ - && cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make -j8 && make install \ + && cmake -DCMAKE_INSTALL_PREFIX=/usr .. && make -j8 && make install \ && cd ../.. && rm -rf opendht diff --git a/docker/DockerfileTravisLlvm b/docker/DockerfileTravisLlvm new file mode 100644 index 00000000..94f89479 --- /dev/null +++ b/docker/DockerfileTravisLlvm @@ -0,0 +1,6 @@ +FROM aberaud/opendht-deps-llvm +MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com> +COPY . /root/opendht +RUN cd /root/opendht && mkdir build && cd build \ + && cmake -DCMAKE_INSTALL_PREFIX=/usr .. && make -j8 && make install \ + && cd ../.. && rm -rf opendht -- GitLab