From 15bb56663673543b2810a5942e90bda919af3ba5 Mon Sep 17 00:00:00 2001 From: Abdelrahman Mahmoud Date: Fri, 23 Feb 2018 12:44:10 -0500 Subject: [PATCH] Remove a bunch of things that I don't think we need --- .travis.yml | 7 ++----- docker/Dockerfile-CentOS | 4 ++-- docker/Dockerfile-Ubuntu | 9 ++++----- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8a299ce..1b48d6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,6 @@ -dist: trusty sudo: required -language: ruby services: - docker - +language: ruby before_install: - - docker build --file=docker/Dockerfile-Ubuntu --tag=v4.0.0:affdex . - - docker run v4.0.0:affdex + - docker build --file=docker/Dockerfile-Ubuntu --tag=v4.0.0:affdex diff --git a/docker/Dockerfile-CentOS b/docker/Dockerfile-CentOS index b093c53..01b7b74 100644 --- a/docker/Dockerfile-CentOS +++ b/docker/Dockerfile-CentOS @@ -39,7 +39,7 @@ RUN git clone https://github.com/Affectiva/cpp-sdk-samples.git $SRC_DIR/sdk-samp #### CMAKE #### WORKDIR $SRC_DIR RUN wget https://cmake.org/files/v3.8/cmake-3.8.1.tar.gz \ - && tar -xvf cmake-3.8.1.tar.gz && rm cmake-3.8.1.tar.gz + && tar -xf cmake-3.8.1.tar.gz && rm cmake-3.8.1.tar.gz RUN cd $SRC_DIR/cmake-3.8.1/ && \ ./bootstrap --system-curl && \ make -j$(nproc) && \ @@ -49,7 +49,7 @@ RUN cd $SRC_DIR/cmake-3.8.1/ && \ #### BOOST #### WORKDIR $SRC_DIR RUN wget https://sourceforge.net/projects/boost/files/boost/1.63.0/boost_1_63_0.tar.gz --no-check-certificate && \ - tar -xvf boost_1_63_0.tar.gz && \ + tar -xf boost_1_63_0.tar.gz && \ rm boost_1_63_0.tar.gz && \ cd $SRC_DIR/boost_1_63_0 && \ ./bootstrap.sh &&\ diff --git a/docker/Dockerfile-Ubuntu b/docker/Dockerfile-Ubuntu index 492eb5a..dc0bdd8 100644 --- a/docker/Dockerfile-Ubuntu +++ b/docker/Dockerfile-Ubuntu @@ -39,17 +39,16 @@ RUN git clone https://github.com/Affectiva/cpp-sdk-samples.git $SRC_DIR/sdk-samp #### CMAKE #### WORKDIR $SRC_DIR RUN wget https://cmake.org/files/v3.8/cmake-3.8.1.tar.gz \ - && tar -xvf cmake-3.8.1.tar.gz && rm cmake-3.8.1.tar.gz + && tar -xf cmake-3.8.1.tar.gz && rm cmake-3.8.1.tar.gz RUN cd $SRC_DIR/cmake-3.8.1/ && \ ./bootstrap --system-curl && \ - make -j$(nproc) && \ - make install && \ + make -j$(nproc) install > /dev/null && \ rm -rf $SRC_DIR/cmake-3.8.1 #### BOOST #### WORKDIR $SRC_DIR RUN wget https://sourceforge.net/projects/boost/files/boost/1.63.0/boost_1_63_0.tar.gz --no-check-certificate && \ - tar -xvf boost_1_63_0.tar.gz && \ + tar -xf boost_1_63_0.tar.gz && \ rm boost_1_63_0.tar.gz && \ cd $SRC_DIR/boost_1_63_0 && \ ./bootstrap.sh &&\ @@ -71,7 +70,7 @@ RUN wget https://download.affectiva.com/linux/gcc-5.4/affdex-cpp-sdk-4.0-75-ubun RUN mkdir -p $BUILD_DIR &&\ cd $BUILD_DIR &&\ cmake -DOpenCV_DIR=/usr/ -DBOOST_ROOT=/usr/ -DAFFDEX_DIR=$SRC_DIR/affdex-sdk $SRC_DIR/sdk-samples &&\ - make -j$(nproc) + make -j$(nproc) > /dev/null ## CREATE THE ARTIFACT WORKDIR $ARTIFACT_DIR