This is an automated email from the ASF dual-hosted git repository.
huijun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new 14bc58b fix jenkins debian10 (#3570)
14bc58b is described below
commit 14bc58b4938ba7dde3cfea788154755599783ec1
Author: bed debug <huiju...@users.noreply.github.com>
AuthorDate: Sat Jul 18 03:17:33 2020 -0700
fix jenkins debian10 (#3570)
* fixci
* useopenjdk
* order
* updatedebian9
Co-authored-by: Huijun Wu <huij...@twitter.com>
---
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 097a421..57cabcb 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 a4d9350..4d727d0 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 \
