From 14bc58b4938ba7dde3cfea788154755599783ec1 Mon Sep 17 00:00:00 2001 From: bed debug Date: Sat, 18 Jul 2020 03:17:33 -0700 Subject: [PATCH] fix jenkins debian10 (#3570) * fixci * useopenjdk * order * updatedebian9 Co-authored-by: Huijun Wu --- docker/compile/Dockerfile.debian10 | 12 ++++++------ docker/compile/Dockerfile.debian9 | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docker/compile/Dockerfile.debian10 b/docker/compile/Dockerfile.debian10 index 097a421501a..57cabcb73a4 100644 --- a/docker/compile/Dockerfile.debian10 +++ b/docker/compile/Dockerfile.debian10 @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -FROM openjdk:11.0.6-slim-buster +FROM openjdk:11.0.6-jdk-buster # This is passed to the heron build command via the --config flag ENV TARGET_PLATFORM debian @@ -27,21 +27,21 @@ RUN apt-get update && apt-get -y install \ build-essential \ cmake \ curl \ - libssl-dev \ git \ + libcppunit-dev \ + libssl-dev \ libtool \ libtool-bin \ - libcppunit-dev \ pkg-config \ python \ python3 \ python3-dev \ - software-properties-common \ python3-setuptools \ + software-properties-common \ tree \ - zip \ unzip \ - wget + wget \ + zip RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \ && chmod +x /tmp/bazel.sh \ diff --git a/docker/compile/Dockerfile.debian9 b/docker/compile/Dockerfile.debian9 index a4d93502faf..4d727d0c60a 100644 --- a/docker/compile/Dockerfile.debian9 +++ b/docker/compile/Dockerfile.debian9 @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -FROM openjdk:11-jdk-slim-stretch +FROM openjdk:11-jdk-stretch # This is passed to the heron build command via the --config flag ENV TARGET_PLATFORM debian @@ -27,20 +27,20 @@ RUN apt-get update && apt-get -y install \ build-essential \ cmake \ curl \ - libssl-dev \ git \ + libcppunit-dev \ + libssl-dev \ libtool \ libtool-bin \ - libcppunit-dev \ pkg-config \ - software-properties-common \ python \ python3-dev \ python3-setuptools \ + software-properties-common \ tree \ - zip \ unzip \ - wget + wget \ + zip RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \ && chmod +x /tmp/bazel.sh \