From 403642268695246aec08cf0577cd978b5f77ccb6 Mon Sep 17 00:00:00 2001 From: Gunhan Gulsoy Date: Sun, 31 Dec 2017 22:35:56 -0800 Subject: [PATCH] Upgrade all TF base images to ubuntu 16. (#15458) * Upgrade all TF base images to ubuntu 16. * Update bazel version for CI docker image. * Fix links to pylint in sanity build script. * Upgrade bazel version to 0.8 on devel docker images. --- tensorflow/tools/ci_build/Dockerfile.android | 2 +- tensorflow/tools/ci_build/Dockerfile.cpu | 2 +- tensorflow/tools/ci_build/Dockerfile.cpu.mpi | 2 +- tensorflow/tools/ci_build/Dockerfile.hadoop | 2 +- tensorflow/tools/ci_build/Dockerfile.pi | 2 +- tensorflow/tools/ci_build/Dockerfile.pi-python3 | 2 +- tensorflow/tools/ci_build/ci_sanity.sh | 4 ++-- tensorflow/tools/ci_build/install/install_bazel.sh | 2 +- tensorflow/tools/docker/Dockerfile.devel | 2 +- tensorflow/tools/docker/Dockerfile.devel-gpu | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tensorflow/tools/ci_build/Dockerfile.android b/tensorflow/tools/ci_build/Dockerfile.android index 99a69d7b43b..dcf077791a9 100644 --- a/tensorflow/tools/ci_build/Dockerfile.android +++ b/tensorflow/tools/ci_build/Dockerfile.android @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM ubuntu:16.04 LABEL maintainer="Jan Prach " diff --git a/tensorflow/tools/ci_build/Dockerfile.cpu b/tensorflow/tools/ci_build/Dockerfile.cpu index 57a854a9df7..c61fda09af0 100644 --- a/tensorflow/tools/ci_build/Dockerfile.cpu +++ b/tensorflow/tools/ci_build/Dockerfile.cpu @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM ubuntu:16.04 LABEL maintainer="Jan Prach " diff --git a/tensorflow/tools/ci_build/Dockerfile.cpu.mpi b/tensorflow/tools/ci_build/Dockerfile.cpu.mpi index 2bf7fd1d234..d9f5b7c0364 100644 --- a/tensorflow/tools/ci_build/Dockerfile.cpu.mpi +++ b/tensorflow/tools/ci_build/Dockerfile.cpu.mpi @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM ubuntu:16.04 LABEL authors="Andrew Gibiansky , Joel Hestness " diff --git a/tensorflow/tools/ci_build/Dockerfile.hadoop b/tensorflow/tools/ci_build/Dockerfile.hadoop index 6010aedb339..d05dedafbe2 100644 --- a/tensorflow/tools/ci_build/Dockerfile.hadoop +++ b/tensorflow/tools/ci_build/Dockerfile.hadoop @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM ubuntu:16.04 LABEL maintainer="Jonathan Hseu " diff --git a/tensorflow/tools/ci_build/Dockerfile.pi b/tensorflow/tools/ci_build/Dockerfile.pi index 75ef30d32b0..176f9f63219 100644 --- a/tensorflow/tools/ci_build/Dockerfile.pi +++ b/tensorflow/tools/ci_build/Dockerfile.pi @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM ubuntu:16.04 LABEL maintainer="Jan Prach " diff --git a/tensorflow/tools/ci_build/Dockerfile.pi-python3 b/tensorflow/tools/ci_build/Dockerfile.pi-python3 index b1c648ba301..14ebb9069f9 100644 --- a/tensorflow/tools/ci_build/Dockerfile.pi-python3 +++ b/tensorflow/tools/ci_build/Dockerfile.pi-python3 @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM ubuntu:16.04 LABEL maintainer="Jan Prach " diff --git a/tensorflow/tools/ci_build/ci_sanity.sh b/tensorflow/tools/ci_build/ci_sanity.sh index 4021d794b6c..b728c878da0 100755 --- a/tensorflow/tools/ci_build/ci_sanity.sh +++ b/tensorflow/tools/ci_build/ci_sanity.sh @@ -111,9 +111,9 @@ do_pylint() { fi if [[ $1 == "PYTHON2" ]]; then - PYLINT_BIN="python /usr/local/lib/python2.7/dist-packages/pylint/lint.py" + PYLINT_BIN="python -m pylint" elif [[ $1 == "PYTHON3" ]]; then - PYLINT_BIN="python3 /usr/local/lib/python3.4/dist-packages/pylint/lint.py" + PYLINT_BIN="python3 -m pylint" else echo "Unrecognized python version (PYTHON2 | PYTHON3): $1" return 1 diff --git a/tensorflow/tools/ci_build/install/install_bazel.sh b/tensorflow/tools/ci_build/install/install_bazel.sh index 1454264a800..cf8737c2d8c 100755 --- a/tensorflow/tools/ci_build/install/install_bazel.sh +++ b/tensorflow/tools/ci_build/install/install_bazel.sh @@ -15,7 +15,7 @@ # ============================================================================== # Select bazel version. -BAZEL_VERSION="0.5.4" +BAZEL_VERSION="0.8.0" set +e local_bazel_ver=$(bazel version 2>&1 | grep -i label | awk '{print $3}') diff --git a/tensorflow/tools/docker/Dockerfile.devel b/tensorflow/tools/docker/Dockerfile.devel index 0a6860e7915..cd22f1832f7 100644 --- a/tensorflow/tools/docker/Dockerfile.devel +++ b/tensorflow/tools/docker/Dockerfile.devel @@ -57,7 +57,7 @@ RUN echo "startup --batch" >>/etc/bazel.bazelrc RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \ >>/etc/bazel.bazelrc # Install the most recent bazel release. -ENV BAZEL_VERSION 0.5.4 +ENV BAZEL_VERSION 0.8.0 WORKDIR / RUN mkdir /bazel && \ cd /bazel && \ diff --git a/tensorflow/tools/docker/Dockerfile.devel-gpu b/tensorflow/tools/docker/Dockerfile.devel-gpu index 4164cc3f888..d0c540ae560 100644 --- a/tensorflow/tools/docker/Dockerfile.devel-gpu +++ b/tensorflow/tools/docker/Dockerfile.devel-gpu @@ -66,7 +66,7 @@ RUN echo "startup --batch" >>/etc/bazel.bazelrc RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \ >>/etc/bazel.bazelrc # Install the most recent bazel release. -ENV BAZEL_VERSION 0.5.4 +ENV BAZEL_VERSION 0.8.0 WORKDIR / RUN mkdir /bazel && \ cd /bazel && \