You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by ni...@apache.org on 2020/06/30 03:47:17 UTC
[incubator-heron] 01/01: Distribution Dockerfile cleanup
This is an automated email from the ASF dual-hosted git repository.
nicknezis pushed a commit to branch nicknezis/dist-image-ncat-fix
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
commit 89eac91ea252e0c2974189c0a2d698dfb9301abf
Author: Nicholas Nezis <ni...@gmail.com>
AuthorDate: Mon Jun 29 23:46:15 2020 -0400
Distribution Dockerfile cleanup
---
docker/dist/Dockerfile.dist.centos7 | 24 +++++++++++-------------
docker/dist/Dockerfile.dist.debian10 | 19 ++++++++++---------
docker/dist/Dockerfile.dist.debian9 | 15 +++++++--------
docker/dist/Dockerfile.dist.ubuntu14.04 | 16 ++++++++++------
docker/dist/Dockerfile.dist.ubuntu16.04 | 24 +++++++++++++-----------
docker/dist/Dockerfile.dist.ubuntu18.04 | 13 ++++++++++---
docker/dist/Dockerfile.dist.ubuntu20.04 | 13 ++++++++++---
7 files changed, 71 insertions(+), 53 deletions(-)
diff --git a/docker/dist/Dockerfile.dist.centos7 b/docker/dist/Dockerfile.dist.centos7
index 686a8fb..89633e5 100644
--- a/docker/dist/Dockerfile.dist.centos7
+++ b/docker/dist/Dockerfile.dist.centos7
@@ -17,19 +17,17 @@
FROM centos:centos7
-RUN yum -y upgrade
-RUN yum -y install python; yum clean all
-RUN yum -y install unzip; yum clean all
-RUN yum -y install which; yum clean all
-RUN yum -y install curl; yum clean all
-RUN yum -y install nmap-ncat; yum clean all
-RUN yum -y install python python3-setuptools; yum clean all
-
-RUN yum install epel-release; yum clean all
-RUN yum update -y
-RUN yum install -y supervisor; yum clean all
-
-RUN yum -y install java-11-openjdk java-11-openjdk-devel; yum clean all
+RUN yum install epel-release \
+ && yum -y update \
+ && yum -y install \
+ curl \
+ java-11-openjdk \
+ supervisor \
+ nmap-ncat \
+ python \
+ unzip \
+ which \
+ && yum clean all
ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk
diff --git a/docker/dist/Dockerfile.dist.debian10 b/docker/dist/Dockerfile.dist.debian10
index a78d6f9..8f1caa3 100644
--- a/docker/dist/Dockerfile.dist.debian10
+++ b/docker/dist/Dockerfile.dist.debian10
@@ -15,15 +15,16 @@
# specific language governing permissions and limitations
# under the License.
-FROM openjdk:11.0.6-slim-buster
-
-RUN apt-get update && apt-get -y install \
- netcat-openbsd \
- curl \
- python \
- python2.7-dev \
- supervisor \
- unzip
+FROM openjdk:11.0.6-jre-slim-buster
+
+RUN apt-get update \
+ && apt-get -y install \
+ curl \
+ netcat-openbsd \
+ python \
+ supervisor \
+ unzip \
+ && apt-get clean
ADD artifacts /heron
diff --git a/docker/dist/Dockerfile.dist.debian9 b/docker/dist/Dockerfile.dist.debian9
index 5d56c1e..bf89741 100644
--- a/docker/dist/Dockerfile.dist.debian9
+++ b/docker/dist/Dockerfile.dist.debian9
@@ -15,18 +15,17 @@
# specific language governing permissions and limitations
# under the License.
-FROM openjdk:11-jdk-slim-stretch
+FROM openjdk:11-jre-slim-stretch
-RUN apt-get -y update && apt-get -y install \
+RUN apt-get -y update \
+ && apt-get -y install \
+ curl \
netcat-openbsd \
python \
- python-dev \
+ supervisor \
unzip \
- curl \
- vim \
- supervisor && \
- apt-get clean all && \
- rm -rf /var/lib/apt/lists/*
+ && apt-get clean all \
+ && rm -rf /var/lib/apt/lists/*
ADD artifacts /heron
diff --git a/docker/dist/Dockerfile.dist.ubuntu14.04 b/docker/dist/Dockerfile.dist.ubuntu14.04
index df807aa..676efa4 100644
--- a/docker/dist/Dockerfile.dist.ubuntu14.04
+++ b/docker/dist/Dockerfile.dist.ubuntu14.04
@@ -17,16 +17,20 @@
FROM ubuntu:14.04
-RUN apt-get -y update && apt-get -y install \
+RUN apt-get -y update \
+ && apt-get -y install \
+ curl \
+ netcat-openbsd \
python \
- python3 \
- unzip \
software-properties-common \
supervisor \
- curl
+ unzip \
+ && apt-get clean
-RUN add-apt-repository ppa:openjdk-r/ppa && apt-get -y update && \
- apt-get -y install openjdk-11-jdk-headless
+RUN add-apt-repository ppa:openjdk-r/ppa \
+ && apt-get -y update \
+ && apt-get -y install openjdk-11-jre-headless \
+ && apt-get clean
ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
RUN update-ca-certificates -f
diff --git a/docker/dist/Dockerfile.dist.ubuntu16.04 b/docker/dist/Dockerfile.dist.ubuntu16.04
index bcf6f37..1c5d0ea 100644
--- a/docker/dist/Dockerfile.dist.ubuntu16.04
+++ b/docker/dist/Dockerfile.dist.ubuntu16.04
@@ -17,20 +17,22 @@
FROM ubuntu:16.04
-RUN apt-get update && apt-get install -y software-properties-common
-
-RUN add-apt-repository ppa:openjdk-r/ppa
-
-RUN apt-get -y install \
+RUN apt-get -y update \
+ && apt-get install -y \
+ curl \
+ netcat-openbsd \
python \
- python3 \
- unzip \
software-properties-common \
- curl \
- supervisor
+ supervisor \
+ unzip \
+ && apt-get clean
+
+RUN add-apt-repository ppa:openjdk-r/ppa
-RUN apt-get update && apt-get -y install \
- openjdk-11-jdk-headless
+RUN apt-get update \
+ && apt-get -y install \
+ openjdk-11-jre-headless \
+ && apt-get clean
ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
RUN update-ca-certificates -f
diff --git a/docker/dist/Dockerfile.dist.ubuntu18.04 b/docker/dist/Dockerfile.dist.ubuntu18.04
index 89d4ad7..1e9aa4b 100644
--- a/docker/dist/Dockerfile.dist.ubuntu18.04
+++ b/docker/dist/Dockerfile.dist.ubuntu18.04
@@ -17,9 +17,16 @@
FROM ubuntu:18.04
-RUN apt-get update
-RUN apt-get -y install \
- unzip software-properties-common curl python python3 supervisor openjdk-11-jdk-headless
+RUN apt-get -y update \
+ && apt-get -y install \
+ curl \
+ netcat-openbsd \
+ openjdk-11-jre-headless \
+ python \
+ software-properties-common \
+ supervisor \
+ unzip \
+ && apt-get clean
ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
RUN update-ca-certificates -f
diff --git a/docker/dist/Dockerfile.dist.ubuntu20.04 b/docker/dist/Dockerfile.dist.ubuntu20.04
index 6e22845..4336543 100644
--- a/docker/dist/Dockerfile.dist.ubuntu20.04
+++ b/docker/dist/Dockerfile.dist.ubuntu20.04
@@ -19,9 +19,16 @@ FROM ubuntu:20.04
ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update
-RUN apt-get -y install \
- unzip software-properties-common curl python python3 supervisor openjdk-11-jdk-headless
+RUN apt-get -y update \
+ && apt-get -y install \
+ curl \
+ openjdk-11-jre-headless \
+ netcat-openbsd \
+ python \
+ software-properties-common \
+ supervisor \
+ unzip \
+ && apt-get clean
ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
RUN update-ca-certificates -f