Skip to content

Commit

Permalink
Update python and boost versions in docker images.
Browse files Browse the repository at this point in the history
  • Loading branch information
riga committed May 15, 2020
1 parent 415a901 commit a85e12e
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
20 changes: 10 additions & 10 deletions docker/law-py37/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ RUN yum -y install libffi-devel openssl-devel bzip2-devel json-c-devel curl-deve
wget nano screen git cmake cmake3; yum clean all

# python software
RUN wget -nv https://www.python.org/ftp/python/3.7.6/Python-3.7.6.tgz && \
tar -xzf Python-3.7.6.tgz && \
cd Python-3.7.6 && \
RUN wget -nv https://www.python.org/ftp/python/3.7.7/Python-3.7.7.tgz && \
tar -xzf Python-3.7.7.tgz && \
cd Python-3.7.7 && \
./configure --enable-optimizations --enable-shared && \
make altinstall && \
cd .. && \
rm -rf Python-3.7.6 && \
rm Python-3.7.6.tgz && \
rm -rf Python-3.7.7 && \
rm Python-3.7.7.tgz && \
ln -s -f "$( which python3.7 )" "$( dirname "$( which python3.7 )" )/python3" && \
python3 --version && \
ln -s -f "$( which pip3.7 )" "$( dirname "$( which pip3.7 )" )/pip3" && \
Expand All @@ -45,16 +45,16 @@ RUN wget -nv https://www.python.org/ftp/python/3.7.6/Python-3.7.6.tgz && \
RUN yum -y install boost-devel boost-python; yum clean all

# boost for custom python 3.7
RUN wget -nv https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.gz && \
tar -xzf boost_1_72_0.tar.gz && \
cd boost_1_72_0 && \
RUN wget -nv https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.gz && \
tar -xzf boost_1_73_0.tar.gz && \
cd boost_1_73_0 && \
./bootstrap.sh --with-libraries=system,thread,python --with-python="$( which python3.7 )" && \
perl -pi -e 's!(\Qincludes ?= $(prefix)/include/python$(version)\E)!\1m!' tools/build/src/tools/python.jam && \
./b2 install --prefix=/usr && \
ldconfig && \
cd .. && \
rm -rf boost_1_72_0 && \
rm boost_1_72_0.tar.gz
rm -rf boost_1_73_0 && \
rm boost_1_73_0.tar.gz

# WLCG software
RUN rpm -Uvh https://repo.opensciencegrid.org/osg/3.5/osg-3.5-el7-release-latest.rpm
Expand Down
20 changes: 10 additions & 10 deletions docker/law-py38/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ RUN yum -y install libffi-devel openssl-devel bzip2-devel json-c-devel curl-deve
wget nano screen git cmake cmake3; yum clean all

# python software
RUN wget -nv https://www.python.org/ftp/python/3.8.2/Python-3.8.2.tgz && \
tar -xzf Python-3.8.2.tgz && \
cd Python-3.8.2 && \
RUN wget -nv https://www.python.org/ftp/python/3.8.3/Python-3.8.3.tgz && \
tar -xzf Python-3.8.3.tgz && \
cd Python-3.8.3 && \
./configure --enable-optimizations --enable-shared && \
make altinstall && \
cd .. && \
rm -rf Python-3.8.2 && \
rm Python-3.8.2.tgz && \
rm -rf Python-3.8.3 && \
rm Python-3.8.3.tgz && \
ln -s -f "$( which python3.8 )" "$( dirname "$( which python3.8 )" )/python3" && \
python3 --version && \
ln -s -f "$( which pip3.8 )" "$( dirname "$( which pip3.8 )" )/pip3" && \
Expand All @@ -45,16 +45,16 @@ RUN wget -nv https://www.python.org/ftp/python/3.8.2/Python-3.8.2.tgz && \
RUN yum -y install boost-devel boost-python; yum clean all

# boost for custom python 3.8
RUN wget -nv https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.gz && \
tar -xzf boost_1_72_0.tar.gz && \
cd boost_1_72_0 && \
RUN wget -nv https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.gz && \
tar -xzf boost_1_73_0.tar.gz && \
cd boost_1_73_0 && \
./bootstrap.sh --with-libraries=system,thread,python --with-python="$( which python3.8 )" && \
perl -pi -e 's!(\Qincludes ?= $(prefix)/include/python$(version)\E)!\1m!' tools/build/src/tools/python.jam && \
./b2 install --prefix=/usr && \
ldconfig && \
cd .. && \
rm -rf boost_1_72_0 && \
rm boost_1_72_0.tar.gz
rm -rf boost_1_73_0 && \
rm boost_1_73_0.tar.gz

# WLCG software
RUN rpm -Uvh https://repo.opensciencegrid.org/osg/3.5/osg-3.5-el7-release-latest.rpm
Expand Down

0 comments on commit a85e12e

Please sign in to comment.