Merge pull request #557 from tuttleofx/docker

[docker] Split dependencies from tuttleofx build
tuttleofx · Oct 17, 2016 · 448003b · 448003b
2 parents ca7eb4c + d5a438d
commit 448003b
Show file tree

Hide file tree

Showing 6 changed files with 122 additions and 96 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -59,12 +59,14 @@ addons:
     - python3-dev
     - python3-setuptools
     - python3-nose
+    # - python-clint  # not available in https://github.com/travis-ci/apt-package-whitelist
+    # - python-argcomplete  # not available in https://github.com/travis-ci/apt-package-whitelist
     - libfreetype6-dev
     - libbz2-dev
     - libltdl-dev
     - libpng-dev
     - libjpeg-dev
-    - libraw-dev
+    # - libraw-dev
     - libglew-dev
     - libtiff4-dev
     - libilmbase-dev

diff --git a/tools/docker/python2.7/Dockerfile → Dockerfile-env-python2 b/tools/docker/python2.7/Dockerfile → Dockerfile-env-python2
@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM ubuntu:16.04
 
 MAINTAINER TuttleOFX <tuttleofx-dev@googlegroups.com>
 
@@ -14,7 +14,6 @@ RUN apt-get update && apt-get install -y \
   python-numpy \
   python-clint \
   python-argcomplete \
-  python-pip\ 
   python-nose \
   python-imaging \
   libfreetype6-dev \
@@ -57,11 +56,10 @@ ENV PYTHON_VERSION=2.7 \
     DEPENDENCIES_INSTALL=/usr/local \
     PYTHONPATH=${PYTHONPATH}:/usr/local/lib/python2.7/site-packages
 
-RUN mkdir ${TUTTLEOFX_BUILD} ${TRAVIS_BUILD_DIR}
-
 COPY . ${TUTTLEOFX_DEV}
-RUN cd ${TUTTLEOFX_DEV} && git submodule update --init --recursive
 
-RUN cd ${TUTTLEOFX_DEV} && ${TUTTLEOFX_DEV}/tools/travis/install_dependencies.sh && \
-cd ${TUTTLEOFX_DEV} && ${TUTTLEOFX_DEV}/tools/travis/build.sh && \
-rm -rf ${TUTTLEOFX_BUILD} ${TRAVIS_BUILD_DIR}
+RUN mkdir ${TRAVIS_BUILD_DIR} && \
+    cd ${TUTTLEOFX_DEV} && \
+    ${TUTTLEOFX_DEV}/tools/travis/install_dependencies.sh && \
+    rm -rf ${TRAVIS_BUILD_DIR}
+
diff --git a/tools/docker/python3.5/Dockerfile → Dockerfile-env-python3 b/tools/docker/python3.5/Dockerfile → Dockerfile-env-python3
@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM ubuntu:16.04
 
 MAINTAINER TuttleOFX <tuttleofx-dev@googlegroups.com>
 
@@ -14,7 +14,6 @@ RUN apt-get update && apt-get install -y \
   python3-numpy \
   python3-clint \
   python3-argcomplete \
-  python3-pip \
   python3-nose \
   libfreetype6-dev \
   libbz2-dev \
@@ -56,11 +55,10 @@ ENV PYTHON_VERSION=3.5 \
     DEPENDENCIES_INSTALL=/usr/local \
     PYTHONPATH=${PYTHONPATH}:/usr/local/lib/python3.5/site-packages
 
-RUN mkdir ${TUTTLEOFX_BUILD} ${TRAVIS_BUILD_DIR}
-
 COPY . ${TUTTLEOFX_DEV}
-RUN cd ${TUTTLEOFX_DEV} && git submodule update --init --recursive
 
-RUN cd ${TUTTLEOFX_DEV} && ${TUTTLEOFX_DEV}/tools/travis/install_dependencies.sh && \
-cd ${TUTTLEOFX_DEV} && ${TUTTLEOFX_DEV}/tools/travis/build.sh && \
-rm -rf ${TUTTLEOFX_BUILD} ${TRAVIS_BUILD_DIR}
+RUN mkdir ${TRAVIS_BUILD_DIR} && \
+    cd ${TUTTLEOFX_DEV} && \
+    ${TUTTLEOFX_DEV}/tools/travis/install_dependencies.sh && \
+    rm -rf ${TRAVIS_BUILD_DIR}
+
diff --git a/Dockerfile-python2 b/Dockerfile-python2
@@ -0,0 +1,10 @@
+FROM tuttleofx/tuttleofx-env:python2-latest
+
+MAINTAINER TuttleOFX <tuttleofx-dev@googlegroups.com>
+
+RUN mkdir ${TUTTLEOFX_BUILD} && \
+    cd ${TUTTLEOFX_DEV} && \
+    git submodule update --init --recursive && \
+    ${TUTTLEOFX_DEV}/tools/travis/build.sh && \
+    rm -rf ${TUTTLEOFX_BUILD}
+
diff --git a/Dockerfile-python3 b/Dockerfile-python3
@@ -0,0 +1,10 @@
+FROM tuttleofx/tuttleofx-env:python3-latest
+
+MAINTAINER TuttleOFX <tuttleofx-dev@googlegroups.com>
+
+RUN mkdir ${TUTTLEOFX_BUILD} && \
+    cd ${TUTTLEOFX_DEV} && \
+    git submodule update --init --recursive && \
+    ${TUTTLEOFX_DEV}/tools/travis/build.sh && \
+    rm -rf ${TUTTLEOFX_BUILD}
+
diff --git a/tools/travis/install_dependencies.sh b/tools/travis/install_dependencies.sh
@@ -5,86 +5,94 @@ set -e
 # Print commands and their arguments as they are executed.
 set -x
 
-if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
-
-    # Install python packages to run sam command line
-    if [[ ${PYTHON_VERSION} == "2.7" ]]; then
-        pip install --user clint argcomplete
-    # elif [[ ${PYTHON_VERSION} == "3.2" ]]; then
-        # easy_install3 pip --prefix=$HOME/local
-        # pip3 install --user clint argcomplete
+# Use TRAVIS_JOB_ID environment variable to detect if the script is run on Travis CI.
+if [ -n "${TRAVIS_JOB_ID}" ]; then
+    if  [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
+        # Install python packages to run sam command line
+        # On travis we need to install some python packages not available in the https://github.com/travis-ci/apt-package-whitelist
+        if [[ ${PYTHON_VERSION} == 2* ]]; then
+            pip install --user clint argcomplete
+        elif [[ ${PYTHON_VERSION} == 3* ]]; then
+            # For pip3: https://github.com/travis-ci/travis-ci/issues/1528		
+            cd $TRAVIS_BUILD_DIR
+            wget https://bootstrap.pypa.io/3.2/get-pip.py
+            python3 get-pip.py --user
+
+            pip3 install --user clint argcomplete
+        fi
+        # If the cache of dependencies exists
+        if [ -d "${DEPENDENCIES_INSTALL}/lib/" ]; then
+            echo 'Using cached directory.';
+            exit 0
+        fi
     fi
+fi
 
-    # Use TRAVIS_JOB_ID to detect that we are in travis.
-    # In that case, use a simple check to detect if the cache is already there.
-    if  [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCIES_INSTALL}/lib/" ]; then
-
-        # Target versions
-        FFMPEG_RELEASE=ffmpeg-2.2.9
-        ACES_RELEASE=aces_container-1.0
-        CTL_RELEASE=ctl-1.5.2
-        SEEXPR_VERSION=1.0.1
-        SEEXPR_RELEASE=SeExpr-rel-$SEEXPR_VERSION
-        OCIO_VERSION=1.0.9
-        OCIO_RELEASE=OpenColorIO-$OCIO_VERSION
-        LIBRAW_VERSION=0.16.2
-        LIBRAW_RELEASE=LibRaw-$LIBRAW_VERSION
-        OIIO_VERSION=1.6.13
-        OIIO_RELEASE=oiio-Release-$OIIO_VERSION
-
-        cd $TRAVIS_BUILD_DIR
-        wget https://www.ffmpeg.org/releases/$FFMPEG_RELEASE.tar.bz2
-        bunzip2 $FFMPEG_RELEASE.tar.bz2
-        tar -xf $FFMPEG_RELEASE.tar > /dev/null 2>&1
-        cd $FFMPEG_RELEASE
-        ./configure --prefix=${DEPENDENCIES_INSTALL} --enable-shared --disable-static --disable-yasm && make && make install
-
-        cd $TRAVIS_BUILD_DIR
-        wget https://github.com/ampas/aces_container/archive/v1.0.tar.gz -O $ACES_RELEASE.tar.gz
-        tar -xzf $ACES_RELEASE.tar.gz > /dev/null 2>&1
-        mkdir $ACES_RELEASE/build
-        cd $ACES_RELEASE/build
-        cmake .. -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} && make && make install
-
-        cd $TRAVIS_BUILD_DIR
-        wget https://github.com/ampas/CTL/archive/$CTL_RELEASE.tar.gz -O $CTL_RELEASE.tar.gz
-        tar -xzf $CTL_RELEASE.tar.gz > /dev/null 2>&1
-        mkdir CTL-$CTL_RELEASE/build
-        cd CTL-$CTL_RELEASE/build
-        cmake .. -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} && make && make install
-
-        cd $TRAVIS_BUILD_DIR
-        wget https://github.com/wdas/SeExpr/archive/rel-$SEEXPR_VERSION.tar.gz -O $SEEXPR_RELEASE.tar.gz
-        tar -xzf $SEEXPR_RELEASE.tar.gz > /dev/null 2>&1
-        mkdir $SEEXPR_RELEASE/build
-        cd $SEEXPR_RELEASE/build
-        cmake .. -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} && make && make install
-
-        cd $TRAVIS_BUILD_DIR
-        wget https://github.com/imageworks/OpenColorIO/archive/v$OCIO_VERSION.tar.gz -O $OCIO_RELEASE.tar.gz
-        tar -xzf $OCIO_RELEASE.tar.gz > /dev/null 2>&1
-        mkdir $OCIO_RELEASE/build
-        cd $OCIO_RELEASE/build
-        cmake .. -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} && make && make install
-
-        cd $TRAVIS_BUILD_DIR
-        wget https://github.com/LibRaw/LibRaw/archive/$LIBRAW_VERSION.tar.gz -O $LIBRAW_RELEASE.tar.gz
-        tar -xzf $LIBRAW_RELEASE.tar.gz > /dev/null 2>&1
-        mkdir $LIBRAW_RELEASE/build
-        cd $LIBRAW_RELEASE/build
-        ./configure --prefix=${DEPENDENCIES_INSTALL} && make && make install
-
-        cd $TRAVIS_BUILD_DIR
-        wget https://github.com/OpenImageIO/oiio/archive/Release-$OIIO_VERSION.tar.gz -O $OIIO_RELEASE.tar.gz
-        tar -xzf $OIIO_RELEASE.tar.gz > /dev/null 2>&1
-        mkdir $OIIO_RELEASE/build
-        cd $OIIO_RELEASE/build
-        cmake .. -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} -DCMAKE_PREFIX_PATH=${DEPENDENCIES_INSTALL} -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" && make && make install
-
-    else
-        echo 'Using cached directory.';
-    fi
+if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
 
+    # Target versions
+    FFMPEG_RELEASE=ffmpeg-2.2.9
+    ACES_RELEASE=aces_container-1.0
+    CTL_RELEASE=ctl-1.5.2
+    SEEXPR_VERSION=1.0.1
+    SEEXPR_RELEASE=SeExpr-rel-$SEEXPR_VERSION
+    OCIO_VERSION=1.0.9
+    OCIO_RELEASE=OpenColorIO-$OCIO_VERSION
+    LIBRAW_VERSION=0.16.2
+    LIBRAW_RELEASE=LibRaw-$LIBRAW_VERSION
+    OIIO_VERSION=1.6.13
+    OIIO_RELEASE=oiio-Release-$OIIO_VERSION
+
+    cd $TRAVIS_BUILD_DIR
+    wget https://www.ffmpeg.org/releases/$FFMPEG_RELEASE.tar.bz2
+    bunzip2 $FFMPEG_RELEASE.tar.bz2
+    tar -xf $FFMPEG_RELEASE.tar > /dev/null 2>&1
+    cd $FFMPEG_RELEASE
+    ./configure --prefix=${DEPENDENCIES_INSTALL} --enable-shared --disable-static --disable-yasm --disable-debug && make && make install
+
+    cd $TRAVIS_BUILD_DIR
+    wget https://github.com/ampas/aces_container/archive/v1.0.tar.gz -O $ACES_RELEASE.tar.gz
+    tar -xzf $ACES_RELEASE.tar.gz > /dev/null 2>&1
+    mkdir $ACES_RELEASE/build
+    cd $ACES_RELEASE/build
+    cmake .. -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} && make && make install/strip
+
+    cd $TRAVIS_BUILD_DIR
+    wget https://github.com/ampas/CTL/archive/$CTL_RELEASE.tar.gz -O $CTL_RELEASE.tar.gz
+    tar -xzf $CTL_RELEASE.tar.gz > /dev/null 2>&1
+    mkdir CTL-$CTL_RELEASE/build
+    cd CTL-$CTL_RELEASE/build
+    cmake .. -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} && make && make install/strip
+
+    cd $TRAVIS_BUILD_DIR
+    wget https://github.com/wdas/SeExpr/archive/rel-$SEEXPR_VERSION.tar.gz -O $SEEXPR_RELEASE.tar.gz
+    tar -xzf $SEEXPR_RELEASE.tar.gz > /dev/null 2>&1
+    mkdir $SEEXPR_RELEASE/build
+    cd $SEEXPR_RELEASE/build
+    cmake .. -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} && make && make install/strip
+
+    cd $TRAVIS_BUILD_DIR
+    wget https://github.com/imageworks/OpenColorIO/archive/v$OCIO_VERSION.tar.gz -O $OCIO_RELEASE.tar.gz
+    tar -xzf $OCIO_RELEASE.tar.gz > /dev/null 2>&1
+    mkdir $OCIO_RELEASE/build
+    cd $OCIO_RELEASE/build
+    cmake .. -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} && make && make install/strip
+
+    cd $TRAVIS_BUILD_DIR
+    wget https://github.com/LibRaw/LibRaw/archive/$LIBRAW_VERSION.tar.gz -O $LIBRAW_RELEASE.tar.gz
+    tar -xzf $LIBRAW_RELEASE.tar.gz > /dev/null 2>&1
+    mkdir $LIBRAW_RELEASE/build
+    cd $LIBRAW_RELEASE/build
+    # edit CMake file to avoid LibRaw to install some files to /usr/ (permissions error)
+    sed -l 590 -i 's/${CMAKE_ROOT}/share/g' ../CMakeLists.txt
+    cmake .. -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} && make && make install/strip
+
+    cd $TRAVIS_BUILD_DIR
+    wget https://github.com/OpenImageIO/oiio/archive/Release-$OIIO_VERSION.tar.gz -O $OIIO_RELEASE.tar.gz
+    tar -xzf $OIIO_RELEASE.tar.gz > /dev/null 2>&1
+    mkdir $OIIO_RELEASE/build
+    cd $OIIO_RELEASE/build
+    cmake .. -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} -DCMAKE_PREFIX_PATH=${DEPENDENCIES_INSTALL} -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" && make && make install/strip
 
 elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
 
@@ -94,11 +102,11 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
     brew tap homebrew/science
 
     echo "Brew install python & nose"
-    if [[ ${PYTHON_VERSION} == "2.7" ]]; then
+    if [[ ${PYTHON_VERSION} == 2* ]]; then
         brew install python
         pip install nose
         pip install clint argcomplete
-    elif [[ ${PYTHON_VERSION} == "3.2" ]]; then
+    elif [[ ${PYTHON_VERSION} == 3* ]]; then
         brew install python3
         pip3 install nose
         pip3 install clint argcomplete