diff --git a/tools/docker/centos-8.Dockerfile b/tools/docker/centos-8.Dockerfile index be1a6a9396..0858a967c3 100644 --- a/tools/docker/centos-8.Dockerfile +++ b/tools/docker/centos-8.Dockerfile @@ -18,7 +18,7 @@ RUN dnf -y update \ # Install Java 8 SDK RUN dnf -y update \ -&& dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel \ +&& dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel maven \ && dnf clean all \ && rm -rf /var/cache/dnf diff --git a/tools/docker/debian-10.Dockerfile b/tools/docker/debian-10.Dockerfile index a216e0f784..94dfa03ef8 100644 --- a/tools/docker/debian-10.Dockerfile +++ b/tools/docker/debian-10.Dockerfile @@ -7,7 +7,7 @@ RUN apt-get update -qq \ && apt-get install -qq \ git pkg-config wget make cmake autoconf libtool zlib1g-dev gawk g++ curl subversion \ swig lsb-release \ - default-jdk \ + default-jdk maven \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/tools/docker/test/centos-8/java.Dockerfile b/tools/docker/test/centos-8/java.Dockerfile index f0cc88fa60..07a4d3dc62 100644 --- a/tools/docker/test/centos-8/java.Dockerfile +++ b/tools/docker/test/centos-8/java.Dockerfile @@ -8,7 +8,7 @@ RUN dnf -y update \ && rm -rf /var/cache/dnf RUN dnf -y update \ -&& dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel \ +&& dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel maven \ && dnf clean all \ && rm -rf /var/cache/dnf diff --git a/tools/docker/test/debian-10/java.Dockerfile b/tools/docker/test/debian-10/java.Dockerfile index 957c8d0f88..53d453debe 100644 --- a/tools/docker/test/debian-10/java.Dockerfile +++ b/tools/docker/test/debian-10/java.Dockerfile @@ -2,7 +2,7 @@ FROM debian:10 LABEL maintainer="corentinl@google.com" RUN apt-get update \ -&& apt-get install -y -q build-essential zlib1g-dev default-jdk \ +&& apt-get install -y -q build-essential zlib1g-dev default-jdk maven \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/tools/docker/test/ubuntu-16.04/java.Dockerfile b/tools/docker/test/ubuntu-16.04/java.Dockerfile index 9ce22daade..c43d007b9b 100644 --- a/tools/docker/test/ubuntu-16.04/java.Dockerfile +++ b/tools/docker/test/ubuntu-16.04/java.Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:16.04 RUN apt update \ -&& apt install -y -q build-essential zlib1g-dev default-jdk \ +&& apt install -y -q build-essential zlib1g-dev default-jdk maven \ && apt clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/tools/docker/test/ubuntu-18.04/java.Dockerfile b/tools/docker/test/ubuntu-18.04/java.Dockerfile index ce3355a523..ca03a0a693 100644 --- a/tools/docker/test/ubuntu-18.04/java.Dockerfile +++ b/tools/docker/test/ubuntu-18.04/java.Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:18.04 RUN apt-get update -qq \ -&& apt-get install -y -q build-essential zlib1g-dev default-jdk \ +&& apt-get install -y -q build-essential zlib1g-dev default-jdk maven \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/tools/docker/test/ubuntu-19.10/java.Dockerfile b/tools/docker/test/ubuntu-19.10/java.Dockerfile index b3b4a2b014..526193b710 100644 --- a/tools/docker/test/ubuntu-19.10/java.Dockerfile +++ b/tools/docker/test/ubuntu-19.10/java.Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:19.10 RUN apt-get update -qq \ -&& apt-get install -y -q build-essential zlib1g-dev default-jdk \ +&& apt-get install -y -q build-essential zlib1g-dev default-jdk maven \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/tools/docker/test/ubuntu-20.04/java.Dockerfile b/tools/docker/test/ubuntu-20.04/java.Dockerfile index 273e18cc0c..87af0073e7 100644 --- a/tools/docker/test/ubuntu-20.04/java.Dockerfile +++ b/tools/docker/test/ubuntu-20.04/java.Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:20.04 RUN apt-get update -qq \ -&& apt-get install -y -q build-essential zlib1g-dev default-jdk \ +&& apt-get install -y -q build-essential zlib1g-dev default-jdk maven \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/tools/docker/ubuntu-16.04.Dockerfile b/tools/docker/ubuntu-16.04.Dockerfile index 219c848b10..02a8e76d8e 100644 --- a/tools/docker/ubuntu-16.04.Dockerfile +++ b/tools/docker/ubuntu-16.04.Dockerfile @@ -49,7 +49,7 @@ RUN curl --location-trusted \ # Install Java OpenJDK 8 RUN apt-get update -qq \ -&& apt-get install -yq openjdk-8-jdk \ +&& apt-get install -yq openjdk-8-jdk maven \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/tools/docker/ubuntu-18.04.Dockerfile b/tools/docker/ubuntu-18.04.Dockerfile index 5104f6322f..7c787a87c0 100644 --- a/tools/docker/ubuntu-18.04.Dockerfile +++ b/tools/docker/ubuntu-18.04.Dockerfile @@ -18,7 +18,7 @@ RUN apt-get update -qq \ # Java install RUN apt-get update -qq \ -&& apt-get install -yq openjdk-8-jdk \ +&& apt-get install -yq openjdk-8-jdk maven \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/tools/docker/ubuntu-19.10.Dockerfile b/tools/docker/ubuntu-19.10.Dockerfile index 45132edf05..fefbb723be 100644 --- a/tools/docker/ubuntu-19.10.Dockerfile +++ b/tools/docker/ubuntu-19.10.Dockerfile @@ -18,7 +18,7 @@ RUN apt-get update -qq \ # Java install RUN apt-get update -qq \ -&& apt-get install -yq openjdk-8-jdk \ +&& apt-get install -yq openjdk-8-jdk maven \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/tools/docker/ubuntu-20.04.Dockerfile b/tools/docker/ubuntu-20.04.Dockerfile index f6afd7c2fb..6bdd1744a0 100644 --- a/tools/docker/ubuntu-20.04.Dockerfile +++ b/tools/docker/ubuntu-20.04.Dockerfile @@ -20,7 +20,7 @@ RUN apt-get update -qq \ # Java install RUN apt-get update -qq \ -&& apt-get install -yq openjdk-8-jdk \ +&& apt-get install -yq openjdk-8-jdk maven \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*