Skip to content

Commit e080ff5

Browse files
hlopkobuchgr
authored andcommitted
Add python to bazel's dockerfiles
Since 4c55898 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
1 parent 15c2567 commit e080ff5

6 files changed

+26
-24
lines changed

site/docs/install-compile-source.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ title: Compile Bazel from Source
77

88
## <a name="unix"></a> On Linux or macOS
99

10-
1. Ensure that you have OpenJDK 8 installed on your system.
10+
1. Ensure that you have OpenJDK 8 and python installed on your system.
1111
For a system based on debian packages (e.g. Debian, Ubuntu), install
12-
OpenJDK 8 by running the command `sudo apt-get install openjdk-8-jdk`.
12+
OpenJDK 8 and python by running the command `sudo apt-get install
13+
openjdk-8-jdk python`.
1314

1415
2. The standard way of compiling a release version of Bazel from source is to
1516
use a distribution archive. Download `bazel-<VERSION>-dist.zip` from the

src/test/docker/Dockerfile.centos6.7

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ FROM centos:centos6.7
33
RUN yum -y upgrade
44

55
RUN yum -y install \
6-
java-1.8.0-openjdk-devel \
7-
wget which findutils binutils gcc tar gzip \
8-
zip unzip java java-devel git clang zlib-devel \
9-
gcc-c++
6+
wget which git findutils binutils \
7+
zip unzip tar gzip zlib-devel \
8+
clang gcc gcc-c++ \
9+
java java-devel java-1.8.0-openjdk-devel \
10+
python
1011

1112
RUN wget http://people.centos.org/tru/devtools-2/devtools-2.repo -O /etc/yum.repos.d/devtools-2.repo
1213
RUN yum -y install devtoolset-2-gcc devtoolset-2-gcc-c++ devtoolset-2-binutils
Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
FROM debian:stretch
22
RUN apt-get update
3-
RUN apt-get install -y --no-install-recommends curl ca-certificates \
4-
unzip build-essential \
5-
git pkg-config zip unzip \
6-
g++ gcc openjdk-8-jdk \
7-
zlib1g-dev libarchive-dev \
8-
ca-certificates-java && \
3+
RUN apt-get install -y --no-install-recommends \
4+
curl ca-certificates ca-certificates-java \
5+
git pkg-config build-essential \
6+
zip unzip zlib1g-dev libarchive-dev \
7+
g++ gcc openjdk-8-jdk && \
98
apt-get clean

src/test/docker/Dockerfile.fedora23

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ FROM fedora:23
22

33
RUN dnf -y update && dnf clean all
44
RUN dnf -y install \
5-
which findutils binutils gcc tar gzip \
6-
zip unzip java java-devel git clang zlib-devel \
5+
which findutils binutils gcc tar git \
6+
gzip zip unzip zlib-devel \
7+
clang java java-devel python \
78
&& dnf clean all
89
ENV JAVA_HOME /usr/lib/jvm/java-openjdk
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM ubuntu:15.04
22
RUN apt-get update && \
3-
apt-get install -y --no-install-recommends curl ca-certificates \
4-
git pkg-config zip unzip \
5-
g++ gcc openjdk-8-jdk \
6-
zlib1g-dev libarchive-dev \
7-
ca-certificates-java && \
3+
apt-get install -y --no-install-recommends \
4+
curl ca-certificates ca-certificates-java \
5+
git pkg-config \
6+
zip unzip zlib1g-dev libarchive-dev \
7+
g++ gcc openjdk-8-jdk python && \
88
apt-get clean
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM ubuntu:16.04
22
RUN apt-get update && \
3-
apt-get install -y --no-install-recommends curl ca-certificates \
4-
git pkg-config zip unzip \
5-
g++ gcc openjdk-8-jdk \
6-
zlib1g-dev libarchive-dev \
7-
ca-certificates-java && \
3+
apt-get install -y --no-install-recommends \
4+
curl ca-certificates ca-certificates-java \
5+
git pkg-config \
6+
zip unzip zlib1g-dev libarchive-dev \
7+
g++ gcc openjdk-8-jdk python && \
88
apt-get clean

0 commit comments

Comments
 (0)