Add python to bazel's dockerfiles
Since https://github.com/bazelbuild/bazel/commit/4c55898e71d30b32090bef31b43e408d942a24f6 bazel requires python to run create_embedded_tools. This cl
adds it to the affected Dockerfiles. Not to the debian one, since debian has
'python' binary there by default. While add it, sort the packages logically.
RELNOTES: None.
PiperOrigin-RevId: 164574914
diff --git a/site/docs/install-compile-source.md b/site/docs/install-compile-source.md
index 327d18c..5ff5f7f 100644
--- a/site/docs/install-compile-source.md
+++ b/site/docs/install-compile-source.md
@@ -7,9 +7,10 @@
## <a name="unix"></a> On Linux or macOS
-1. Ensure that you have OpenJDK 8 installed on your system.
+1. Ensure that you have OpenJDK 8 and python installed on your system.
For a system based on debian packages (e.g. Debian, Ubuntu), install
- OpenJDK 8 by running the command `sudo apt-get install openjdk-8-jdk`.
+ OpenJDK 8 and python by running the command `sudo apt-get install
+ openjdk-8-jdk python`.
2. The standard way of compiling a release version of Bazel from source is to
use a distribution archive. Download `bazel-<VERSION>-dist.zip` from the
diff --git a/src/test/docker/Dockerfile.centos6.7 b/src/test/docker/Dockerfile.centos6.7
index 9cab385..1d7d665 100644
--- a/src/test/docker/Dockerfile.centos6.7
+++ b/src/test/docker/Dockerfile.centos6.7
@@ -3,10 +3,11 @@
RUN yum -y upgrade
RUN yum -y install \
- java-1.8.0-openjdk-devel \
- wget which findutils binutils gcc tar gzip \
- zip unzip java java-devel git clang zlib-devel \
- gcc-c++
+ wget which git findutils binutils \
+ zip unzip tar gzip zlib-devel \
+ clang gcc gcc-c++ \
+ java java-devel java-1.8.0-openjdk-devel \
+ python
RUN wget http://people.centos.org/tru/devtools-2/devtools-2.repo -O /etc/yum.repos.d/devtools-2.repo
RUN yum -y install devtoolset-2-gcc devtoolset-2-gcc-c++ devtoolset-2-binutils
diff --git a/src/test/docker/Dockerfile.debian-stretch b/src/test/docker/Dockerfile.debian-stretch
index a52716c..deb47ee 100644
--- a/src/test/docker/Dockerfile.debian-stretch
+++ b/src/test/docker/Dockerfile.debian-stretch
@@ -1,9 +1,8 @@
FROM debian:stretch
RUN apt-get update
-RUN apt-get install -y --no-install-recommends curl ca-certificates \
- unzip build-essential \
- git pkg-config zip unzip \
- g++ gcc openjdk-8-jdk \
- zlib1g-dev libarchive-dev \
- ca-certificates-java && \
+RUN apt-get install -y --no-install-recommends \
+ curl ca-certificates ca-certificates-java \
+ git pkg-config build-essential \
+ zip unzip zlib1g-dev libarchive-dev \
+ g++ gcc openjdk-8-jdk && \
apt-get clean
diff --git a/src/test/docker/Dockerfile.fedora23 b/src/test/docker/Dockerfile.fedora23
index 396e1c6..baab0d2 100644
--- a/src/test/docker/Dockerfile.fedora23
+++ b/src/test/docker/Dockerfile.fedora23
@@ -2,7 +2,8 @@
RUN dnf -y update && dnf clean all
RUN dnf -y install \
- which findutils binutils gcc tar gzip \
- zip unzip java java-devel git clang zlib-devel \
+ which findutils binutils gcc tar git \
+ gzip zip unzip zlib-devel \
+ clang java java-devel python \
&& dnf clean all
ENV JAVA_HOME /usr/lib/jvm/java-openjdk
diff --git a/src/test/docker/Dockerfile.ubuntu-15.04 b/src/test/docker/Dockerfile.ubuntu-15.04
index 57aab54..98e0959 100644
--- a/src/test/docker/Dockerfile.ubuntu-15.04
+++ b/src/test/docker/Dockerfile.ubuntu-15.04
@@ -1,8 +1,8 @@
FROM ubuntu:15.04
RUN apt-get update && \
- apt-get install -y --no-install-recommends curl ca-certificates \
- git pkg-config zip unzip \
- g++ gcc openjdk-8-jdk \
- zlib1g-dev libarchive-dev \
- ca-certificates-java && \
+ apt-get install -y --no-install-recommends \
+ curl ca-certificates ca-certificates-java \
+ git pkg-config \
+ zip unzip zlib1g-dev libarchive-dev \
+ g++ gcc openjdk-8-jdk python && \
apt-get clean
diff --git a/src/test/docker/Dockerfile.ubuntu-16.04 b/src/test/docker/Dockerfile.ubuntu-16.04
index d70c7bb..7f1cbb8 100644
--- a/src/test/docker/Dockerfile.ubuntu-16.04
+++ b/src/test/docker/Dockerfile.ubuntu-16.04
@@ -1,8 +1,8 @@
FROM ubuntu:16.04
RUN apt-get update && \
- apt-get install -y --no-install-recommends curl ca-certificates \
- git pkg-config zip unzip \
- g++ gcc openjdk-8-jdk \
- zlib1g-dev libarchive-dev \
- ca-certificates-java && \
+ apt-get install -y --no-install-recommends \
+ curl ca-certificates ca-certificates-java \
+ git pkg-config \
+ zip unzip zlib1g-dev libarchive-dev \
+ g++ gcc openjdk-8-jdk python && \
apt-get clean
