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.
This commit is contained in:
parent
6b6d843cca
commit
4036422686
@ -1,4 +1,4 @@
|
|||||||
FROM ubuntu:14.04
|
FROM ubuntu:16.04
|
||||||
|
|
||||||
LABEL maintainer="Jan Prach <jendap@google.com>"
|
LABEL maintainer="Jan Prach <jendap@google.com>"
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM ubuntu:14.04
|
FROM ubuntu:16.04
|
||||||
|
|
||||||
LABEL maintainer="Jan Prach <jendap@google.com>"
|
LABEL maintainer="Jan Prach <jendap@google.com>"
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM ubuntu:14.04
|
FROM ubuntu:16.04
|
||||||
|
|
||||||
LABEL authors="Andrew Gibiansky <andrew.gibiansky@gmail.com>, Joel Hestness <jthestness@gmail.com>"
|
LABEL authors="Andrew Gibiansky <andrew.gibiansky@gmail.com>, Joel Hestness <jthestness@gmail.com>"
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM ubuntu:14.04
|
FROM ubuntu:16.04
|
||||||
|
|
||||||
LABEL maintainer="Jonathan Hseu <jhseu@google.com>"
|
LABEL maintainer="Jonathan Hseu <jhseu@google.com>"
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM ubuntu:14.04
|
FROM ubuntu:16.04
|
||||||
|
|
||||||
LABEL maintainer="Jan Prach <jendap@google.com>"
|
LABEL maintainer="Jan Prach <jendap@google.com>"
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM ubuntu:14.04
|
FROM ubuntu:16.04
|
||||||
|
|
||||||
LABEL maintainer="Jan Prach <jendap@google.com>"
|
LABEL maintainer="Jan Prach <jendap@google.com>"
|
||||||
|
|
||||||
|
@ -111,9 +111,9 @@ do_pylint() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $1 == "PYTHON2" ]]; then
|
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
|
elif [[ $1 == "PYTHON3" ]]; then
|
||||||
PYLINT_BIN="python3 /usr/local/lib/python3.4/dist-packages/pylint/lint.py"
|
PYLINT_BIN="python3 -m pylint"
|
||||||
else
|
else
|
||||||
echo "Unrecognized python version (PYTHON2 | PYTHON3): $1"
|
echo "Unrecognized python version (PYTHON2 | PYTHON3): $1"
|
||||||
return 1
|
return 1
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
|
|
||||||
# Select bazel version.
|
# Select bazel version.
|
||||||
BAZEL_VERSION="0.5.4"
|
BAZEL_VERSION="0.8.0"
|
||||||
|
|
||||||
set +e
|
set +e
|
||||||
local_bazel_ver=$(bazel version 2>&1 | grep -i label | awk '{print $3}')
|
local_bazel_ver=$(bazel version 2>&1 | grep -i label | awk '{print $3}')
|
||||||
|
@ -57,7 +57,7 @@ RUN echo "startup --batch" >>/etc/bazel.bazelrc
|
|||||||
RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \
|
RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \
|
||||||
>>/etc/bazel.bazelrc
|
>>/etc/bazel.bazelrc
|
||||||
# Install the most recent bazel release.
|
# Install the most recent bazel release.
|
||||||
ENV BAZEL_VERSION 0.5.4
|
ENV BAZEL_VERSION 0.8.0
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
RUN mkdir /bazel && \
|
RUN mkdir /bazel && \
|
||||||
cd /bazel && \
|
cd /bazel && \
|
||||||
|
@ -66,7 +66,7 @@ RUN echo "startup --batch" >>/etc/bazel.bazelrc
|
|||||||
RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \
|
RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \
|
||||||
>>/etc/bazel.bazelrc
|
>>/etc/bazel.bazelrc
|
||||||
# Install the most recent bazel release.
|
# Install the most recent bazel release.
|
||||||
ENV BAZEL_VERSION 0.5.4
|
ENV BAZEL_VERSION 0.8.0
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
RUN mkdir /bazel && \
|
RUN mkdir /bazel && \
|
||||||
cd /bazel && \
|
cd /bazel && \
|
||||||
|
Loading…
Reference in New Issue
Block a user