reverted 64-bit/Dockerfile

pull/6306/head
Tomo Suzuki 5 years ago
parent 30673ff200
commit 699bab2e2d
  1. 2
      kokoro/linux/64-bit/Dockerfile
  2. 35
      kokoro/linux/dockerfile/test/java/Dockerfile

@ -66,8 +66,6 @@ RUN apt-get clean && apt-get update && apt-get install -y --force-yes \
openjdk-7-jdk \
# -- For java_oracle7 -- \
oracle-java7-installer \
# -- For java_linkage_monitor \
openjdk-8-jdk \
# -- For python / python_cpp -- \
python-setuptools \
python-pip \

@ -0,0 +1,35 @@
FROM debian:stretch
# Install dependencies. We start with the basic ones require to build protoc
# and the C++ build
RUN apt-get update && apt-get install -y \
autoconf \
autotools-dev \
build-essential \
bzip2 \
ccache \
curl \
gcc \
git \
libc6 \
libc6-dbg \
libc6-dev \
libgtest-dev \
libtool \
make \
parallel \
time \
wget \
&& apt-get clean
# Java dependencies
RUN apt-get install -y \
# -- For all Java builds -- \
maven \
# -- For java_jdk7 -- \
#openjdk-7-jdk \
# -- For java_oracle7 -- \
#oracle-java7-installer \
# -- For java_linkage_monitor \
openjdk-8-jdk \
&& apt-get clean
Loading…
Cancel
Save