Skip to content

Commit 58a6be8

Browse files
cchampetcchampet
committed
Merge pull request #551 from aoblet/docker
Fix Dockerfile for ubuntu:latest (16 xenial) * with python2.7 * with python3.5
2 parents 1f96e7e + 5493fe1 commit 58a6be8

File tree

3 files changed

+122
-37
lines changed

3 files changed

+122
-37
lines changed

‎Dockerfile‎ renamed to ‎tools/docker/python2.7/Dockerfile‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,26 @@ RUN apt-get update && apt-get install -y \
99
graphviz \
1010
git \
1111
swig \
12-
libboost1.55-all-dev \
12+
libboost-all-dev \
1313
python-dev \
1414
python-numpy \
1515
python-clint \
1616
python-argcomplete \
17+
python-pip\
18+
python-nose \
19+
python-imaging \
1720
libfreetype6-dev \
1821
libbz2-dev \
1922
libltdl-dev \
2023
libpng-dev \
2124
libjpeg-dev \
22-
libraw-dev \
2325
libglew-dev \
24-
libtiff4-dev \
26+
libtiff5-dev \
2527
libilmbase-dev \
2628
libopenexr-dev \
27-
libopenimageio-dev \
2829
libglew-dev \
2930
libgraphviz-dev \
3031
graphviz-dev \
31-
python-nose \
32-
python-imaging \
3332
libopenjpeg-dev \
3433
libturbojpeg \
3534
libxmu-dev \
@@ -39,14 +38,14 @@ RUN apt-get update && apt-get install -y \
3938
libmagickcore-dev \
4039
liblcms2-dev \
4140
libyaml-dev \
42-
libopenctl0.8 \
4341
libcaca-dev \
4442
libtinyxml-dev \
4543
yasm \
4644
libx264-dev \
4745
libxvidcore-dev \
4846
bison \
49-
flex
47+
flex \
48+
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
5049

5150
ENV PYTHON_VERSION=2.7 \
5251
TRAVIS_OS_NAME=linux \
@@ -62,8 +61,7 @@ RUN mkdir ${TUTTLEOFX_BUILD} ${TRAVIS_BUILD_DIR}
6261

6362
COPY . ${TUTTLEOFX_DEV}
6463
RUN cd ${TUTTLEOFX_DEV} && git submodule update --init --recursive
65-
RUN cd ${TUTTLEOFX_DEV} && ${TUTTLEOFX_DEV}/tools/travis/install_dependencies.sh
66-
RUN cd ${TUTTLEOFX_DEV} && ${TUTTLEOFX_DEV}/tools/travis/build.sh
67-
68-
RUN rm -rf ${TUTTLEOFX_BUILD} ${TRAVIS_BUILD_DIR}
6964

65+
RUN cd ${TUTTLEOFX_DEV} && ${TUTTLEOFX_DEV}/tools/travis/install_dependencies.sh && \
66+
cd ${TUTTLEOFX_DEV} && ${TUTTLEOFX_DEV}/tools/travis/build.sh && \
67+
rm -rf ${TUTTLEOFX_BUILD} ${TRAVIS_BUILD_DIR}

‎tools/docker/python3.5/Dockerfile‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
FROM ubuntu:latest
2+
3+
MAINTAINER TuttleOFX <[email protected]>
4+
5+
RUN apt-get update && apt-get install -y \
6+
wget \
7+
build-essential \
8+
cmake \
9+
graphviz \
10+
git \
11+
swig \
12+
libboost-all-dev \
13+
python3-dev \
14+
python3-numpy \
15+
python3-clint \
16+
python3-argcomplete \
17+
python3-pip \
18+
python3-nose \
19+
libfreetype6-dev \
20+
libbz2-dev \
21+
libltdl-dev \
22+
libpng-dev \
23+
libjpeg-dev \
24+
libglew-dev \
25+
libtiff5-dev \
26+
libilmbase-dev \
27+
libopenexr-dev \
28+
libglew-dev \
29+
libgraphviz-dev \
30+
graphviz-dev \
31+
libopenjpeg-dev \
32+
libturbojpeg \
33+
libxmu-dev \
34+
libmp3lame-dev \
35+
liblzma-dev \
36+
libxt-dev \
37+
libmagickcore-dev \
38+
liblcms2-dev \
39+
libyaml-dev \
40+
libcaca-dev \
41+
libtinyxml-dev \
42+
yasm \
43+
libx264-dev \
44+
libxvidcore-dev \
45+
bison \
46+
flex \
47+
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
48+
49+
ENV PYTHON_VERSION=3.5 \
50+
TRAVIS_OS_NAME=linux \
51+
TRAVIS_BUILD_DIR=/tmp/TuttleOFX_build \
52+
TUTTLEOFX_DEV=/opt/TuttleOFX_git \
53+
TUTTLEOFX_BUILD=/tmp/TuttleOFX_build_tmp \
54+
TUTTLEOFX_INSTALL=/usr/local \
55+
OFX_PLUGIN_PATH=/usr/local/OFX \
56+
DEPENDENCIES_INSTALL=/usr/local \
57+
PYTHONPATH=${PYTHONPATH}:/usr/local/lib/python3.5/site-packages
58+
59+
RUN mkdir ${TUTTLEOFX_BUILD} ${TRAVIS_BUILD_DIR}
60+
61+
COPY . ${TUTTLEOFX_DEV}
62+
RUN cd ${TUTTLEOFX_DEV} && git submodule update --init --recursive
63+
64+
RUN cd ${TUTTLEOFX_DEV} && ${TUTTLEOFX_DEV}/tools/travis/install_dependencies.sh && \
65+
cd ${TUTTLEOFX_DEV} && ${TUTTLEOFX_DEV}/tools/travis/build.sh && \
66+
rm -rf ${TUTTLEOFX_BUILD} ${TRAVIS_BUILD_DIR}

‎tools/travis/install_dependencies.sh‎

Lines changed: 46 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,47 +19,68 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
1919
# In that case, use a simple check to detect if the cache is already there.
2020
if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCIES_INSTALL}/lib/" ]; then
2121

22+
# Target versions
23+
FFMPEG_RELEASE=ffmpeg-2.2.9
24+
ACES_RELEASE=aces_container-1.0
25+
CTL_RELEASE=ctl-1.5.2
26+
SEEXPR_VERSION=1.0.1
27+
SEEXPR_RELEASE=SeExpr-rel-$SEEXPR_VERSION
28+
OCIO_VERSION=1.0.9
29+
OCIO_RELEASE=OpenColorIO-$OCIO_VERSION
30+
LIBRAW_VERSION=0.16.2
31+
LIBRAW_RELEASE=LibRaw-$LIBRAW_VERSION
32+
OIIO_VERSION=1.5.16
33+
OIIO_RELEASE=oiio-Release-$OIIO_VERSION
34+
35+
2236
cd $TRAVIS_BUILD_DIR
23-
wget https://www.ffmpeg.org/releases/ffmpeg-2.2.9.tar.bz2
24-
bunzip2 ffmpeg-2.2.9.tar.bz2
25-
tar -xf ffmpeg-2.2.9.tar > /dev/null 2>&1
26-
cd ffmpeg-2.2.9
37+
wget https://www.ffmpeg.org/releases/$FFMPEG_RELEASE.tar.bz2
38+
bunzip2 $FFMPEG_RELEASE.tar.bz2
39+
tar -xf $FFMPEG_RELEASE.tar > /dev/null 2>&1
40+
cd $FFMPEG_RELEASE
2741
./configure --prefix=${DEPENDENCIES_INSTALL} --enable-shared --disable-static --disable-yasm && make && make install
2842

2943
cd $TRAVIS_BUILD_DIR
30-
wget https://github.com/ampas/aces_container/archive/v1.0.tar.gz -O /tmp/aces_container-1.0.tar.gz
31-
tar -xzf /tmp/aces_container-1.0.tar.gz > /dev/null 2>&1
32-
mkdir aces_container-1.0/build
33-
cd aces_container-1.0/build
44+
wget https://github.com/ampas/aces_container/archive/v1.0.tar.gz -O /tmp/$ACES_RELEASE.tar.gz
45+
tar -xzf /tmp/$ACES_RELEASE.tar.gz > /dev/null 2>&1
46+
mkdir $ACES_RELEASE/build
47+
cd $ACES_RELEASE/build
3448
cmake .. -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} && make && make install
3549

3650
cd $TRAVIS_BUILD_DIR
37-
wget https://github.com/ampas/CTL/archive/ctl-1.5.2.tar.gz -O /tmp/ctl-1.5.2.tar.gz
38-
tar -xzf /tmp/ctl-1.5.2.tar.gz > /dev/null 2>&1
39-
mkdir CTL-ctl-1.5.2/build
40-
cd CTL-ctl-1.5.2/build
51+
wget https://github.com/ampas/CTL/archive/$CTL_RELEASE.tar.gz -O /tmp/$CTL_RELEASE.tar.gz
52+
tar -xzf /tmp/$CTL_RELEASE.tar.gz > /dev/null 2>&1
53+
mkdir CTL-$CTL_RELEASE/build
54+
cd CTL-$CTL_RELEASE/build
4155
cmake .. -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} && make && make install
4256

4357
cd $TRAVIS_BUILD_DIR
44-
wget https://github.com/wdas/SeExpr/archive/rel-1.0.1.tar.gz -O /tmp/SeExpr-1.0.1.tar.gz
45-
tar -xzf /tmp/SeExpr-1.0.1.tar.gz > /dev/null 2>&1
46-
mkdir SeExpr-rel-1.0.1/build
47-
cd SeExpr-rel-1.0.1/build
58+
wget https://github.com/wdas/SeExpr/archive/rel-$SEEXPR_VERSION.tar.gz -O /tmp/$SEEXPR_RELEASE.tar.gz
59+
tar -xzf /tmp/$SEEXPR_RELEASE.tar.gz > /dev/null 2>&1
60+
mkdir $SEEXPR_RELEASE/build
61+
cd $SEEXPR_RELEASE/build
4862
cmake .. -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} && make && make install
4963

5064
cd $TRAVIS_BUILD_DIR
51-
wget https://github.com/imageworks/OpenColorIO/archive/v1.0.9.tar.gz -O /tmp/ocio-1.0.9.tar.gz
52-
tar -xzf /tmp/ocio-1.0.9.tar.gz > /dev/null 2>&1
53-
mkdir OpenColorIO-1.0.9/build
54-
cd OpenColorIO-1.0.9/build
65+
wget https://github.com/imageworks/OpenColorIO/archive/v$OCIO_VERSION.tar.gz -O /tmp/$OCIO_RELEASE.tar.gz
66+
tar -xzf /tmp/$OCIO_RELEASE.tar.gz > /dev/null 2>&1
67+
mkdir $OCIO_RELEASE/build
68+
cd $OCIO_RELEASE/build
5569
cmake .. -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} && make && make install
5670

5771
cd $TRAVIS_BUILD_DIR
58-
wget https://github.com/OpenImageIO/oiio/archive/Release-1.5.16.tar.gz -O /tmp/oiio-1.5.16.tar.gz
59-
tar -xzf /tmp/oiio-1.5.16.tar.gz > /dev/null 2>&1
60-
mkdir oiio-Release-1.5.16/build
61-
cd oiio-Release-1.5.16/build
62-
cmake .. -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" && make && make install
72+
wget https://github.com/LibRaw/LibRaw/archive/$LIBRAW_VERSION.tar.gz -O /tmp/$LIBRAW_RELEASE.tar.gz
73+
tar -xzf /tmp/$LIBRAW_RELEASE.tar.gz > /dev/null 2>&1
74+
mkdir $LIBRAW_RELEASE/build
75+
cd $LIBRAW_RELEASE/build
76+
./configure --prefix=${DEPENDENCIES_INSTALL} && make && make install
77+
78+
cd $TRAVIS_BUILD_DIR
79+
wget https://github.com/OpenImageIO/oiio/archive/Release-$OIIO_VERSION.tar.gz -O /tmp/$OIIO_RELEASE.tar.gz
80+
tar -xzf /tmp/$OIIO_RELEASE.tar.gz > /dev/null 2>&1
81+
mkdir $OIIO_RELEASE/build
82+
cd $OIIO_RELEASE/build
83+
cmake .. -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_INSTALL} -DCMAKE_PREFIX_PATH=${DEPENDENCIES_INSTALL} -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" && make && make install
6384

6485
else
6586
echo 'Using cached directory.';

0 commit comments

Comments
 (0)