Internal change.

PiperOrigin-RevId: 248431250
This commit is contained in:
Amit Patankar 2019-05-15 16:44:34 -07:00 committed by TensorFlower Gardener
parent e98a6a77ba
commit 5166de391c
5 changed files with 37 additions and 12 deletions

View File

@ -6,13 +6,14 @@ LABEL maintainer="Amit Patankar <amitpatankar@google.com>"
COPY install/*.sh /install/
RUN /install/install_yum_packages.sh
# Enable devtoolset-7, python27 and rh-python35 in the docker image.
env PATH="/opt/rh/rh-python35/root/usr/bin:/opt/rh/python27/root/usr/bin:/opt/rh/devtoolset-7/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \
LD_LIBRARY_PATH="/opt/rh/rh-python35/root/usr/lib64:/opt/rh/python27/root/usr/lib64:/opt/rh/devtoolset-7/root/usr/lib64:/opt/rh/devtoolset-7/root/usr/lib:/opt/rh/devtoolset-7/root/usr/lib64/dyninst:/opt/rh/devtoolset-7/root/usr/lib/dyninst:/opt/rh/devtoolset-7/root/usr/lib64:/opt/rh/devtoolset-7/root/usr/lib" \
# Enable devtoolset-7 and python27 in the docker image.
env PATH="/opt/rh/python27/root/usr/bin:/opt/rh/devtoolset-7/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \
LD_LIBRARY_PATH="/opt/rh/python27/root/usr/lib64:/opt/rh/devtoolset-7/root/usr/lib64:/opt/rh/devtoolset-7/root/usr/lib:/opt/rh/devtoolset-7/root/usr/lib64/dyninst:/opt/rh/devtoolset-7/root/usr/lib/dyninst:/opt/rh/devtoolset-7/root/usr/lib64:/opt/rh/devtoolset-7/root/usr/lib" \
PCP_DIR="/opt/rh/devtoolset-7/root" \
PERL5LIB="/opt/rh/devtoolset-7/root//usr/lib64/perl5/vendor_perl:/opt/rh/devtoolset-7/root/usr/lib/perl5:/opt/rh/devtoolset-7/root//usr/share/perl5/vendor_perl" \
PKG_CONFIG_PATH="/opt/rh/rh-python35/root/usr/lib64/pkgconfig/:/opt/rh/python27/root/usr/lib64/pkgconfig/"
PKG_CONFIG_PATH="/opt/rh/python27/root/usr/lib64/pkgconfig/"
RUN bash install/install_centos_python35.sh
RUN /install/install_centos_pip_packages.sh
RUN /install/install_bazel_from_source.sh
RUN /install/install_proto3.sh

View File

@ -13,19 +13,19 @@ RUN yum install -y centos-release-scl && \
java-1.8.0-openjdk-devel \
patch \
python27 \
rh-python35 \
wget && \
yum clean all -y
# Enable devtoolset-7, python27, and rh-python35 in the docker image.
env PATH="/opt/rh/rh-python35/root/usr/bin:/opt/rh/python27/root/usr/bin:/opt/rh/devtoolset-7/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \
LD_LIBRARY_PATH="/opt/rh/rh-python35/root/usr/lib64:/opt/rh/python27/root/usr/lib64:/opt/rh/devtoolset-7/root/usr/lib64:/opt/rh/devtoolset-7/root/usr/lib:/opt/rh/devtoolset-7/root/usr/lib64/dyninst:/opt/rh/devtoolset-7/root/usr/lib/dyninst:/opt/rh/devtoolset-7/root/usr/lib64:/opt/rh/devtoolset-7/root/usr/lib" \
# Enable devtoolset-7 and python27 in the docker image.
env PATH="/opt/rh/python27/root/usr/bin:/opt/rh/devtoolset-7/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \
LD_LIBRARY_PATH="/opt/rh/python27/root/usr/lib64:/opt/rh/devtoolset-7/root/usr/lib64:/opt/rh/devtoolset-7/root/usr/lib:/opt/rh/devtoolset-7/root/usr/lib64/dyninst:/opt/rh/devtoolset-7/root/usr/lib/dyninst:/opt/rh/devtoolset-7/root/usr/lib64:/opt/rh/devtoolset-7/root/usr/lib" \
PCP_DIR="/opt/rh/devtoolset-7/root" \
PERL5LIB="/opt/rh/devtoolset-7/root//usr/lib64/perl5/vendor_perl:/opt/rh/devtoolset-7/root/usr/lib/perl5:/opt/rh/devtoolset-7/root//usr/share/perl5/vendor_perl" \
PKG_CONFIG_PATH="/opt/rh/rh-python35/root/usr/lib64/pkgconfig/:/opt/rh/python27/root/usr/lib64/pkgconfig/"
PKG_CONFIG_PATH="/opt/rh/python27/root/usr/lib64/pkgconfig/"
# Install pip packages needed to build tensorflow.
COPY install/*.sh /install/
RUN bash install/install_centos_python35.sh
RUN bash install/install_centos_pip_packages.sh
# Install a /usr/bin/python3 link.
@ -34,7 +34,7 @@ RUN bash install/install_centos_pip_packages.sh
# the python path between the local machine running bazel and the remote setup
# must be the same.
RUN update-alternatives --install /usr/bin/python2 python2 /opt/rh/python27/root/usr/bin/python2.7 0
RUN update-alternatives --install /usr/bin/python3 python3 /opt/rh/rh-python35/root/usr/bin/python3 0
RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.5 0
# Install a ubuntu-compatible openjdk link so that ubuntu JAVA_HOME works
# for this image.

View File

@ -69,7 +69,6 @@ pip3 install pandas==0.19.2
# Benchmark tests require the following:
pip2 install psutil
pip3 install psutil
pip2 install py-cpuinfo
pip3 install py-cpuinfo

View File

@ -0,0 +1,25 @@
#!/usr/bin/env bash
# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# ==============================================================================
yum install epel-release
curl "https://setup.ius.io/" -o setup-ius.sh
sh setup-ius.sh
rm setup-ius.sh
yum --enablerepo=ius install -y python35u
curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"
python3.5 get-pip.py
rm get-pip.py

View File

@ -1,7 +1,7 @@
"""SHA 256 values for each image."""
container_digests = {
"ubuntu16.04": "sha256:b90dcf2f35f3354909f4491bdf019c110b4b4d95ef0395ebf178bc5d523a4208",
"centos6": "sha256:090ca6b5ff4d4a3107cf720c74dbcb1d99e859cfdff5a7c088dae9095c14b463",
"centos6": "sha256:e1dfcd0109eedb51e147bf8f516f97a11f2f1f45b31b40d30828a66be101b7cd",
"cuda10.0-cudnn7-ubuntu14.04": "sha256:d433e1221f802dac393bc8652fabcc63aa46896cd920bb888ae0e2002fe6b756",
"cuda10.0-cudnn7-centos7": "sha256:a453b7147a60928a8345689eae48916a746b3578b5e831bfa151f0529d469c88",
"cuda10.0-cudnn7-centos6": "sha256:a874e7a102abb7da5861dd468b68a25f360bb976a39a26c1e123b770e7900322",