This is an automated email from the ASF dual-hosted git repository. nicknezis pushed a commit to branch nicknezis/buildkit-shrink in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
commit e8b3316105278e976883d29e8c0a616eebff8944 Author: Nicholas Nezis <[email protected]> AuthorDate: Fri Jan 22 21:58:08 2021 -0500 Updating the rest of the Docker images --- docker/dist/Dockerfile.dist.centos7 | 9 +++-- docker/dist/Dockerfile.dist.debian10 | 22 +++++----- docker/dist/Dockerfile.dist.debian9 | 24 +++++------ docker/dist/Dockerfile.dist.ubuntu14.04 | 66 ------------------------------ docker/dist/Dockerfile.dist.ubuntu16.04 | 72 --------------------------------- docker/dist/Dockerfile.dist.ubuntu18.04 | 22 +++++----- docker/dist/Dockerfile.dist.ubuntu20.04 | 22 +++++----- 7 files changed, 49 insertions(+), 188 deletions(-) diff --git a/docker/dist/Dockerfile.dist.centos7 b/docker/dist/Dockerfile.dist.centos7 index b42d0cb..be9e19d 100644 --- a/docker/dist/Dockerfile.dist.centos7 +++ b/docker/dist/Dockerfile.dist.centos7 @@ -35,9 +35,12 @@ RUN yum -y install epel-release \ ENV JAVA_HOME /usr/ -# run heron installer -RUN --mount=type=bind,source=artifacts,target=/tmp/heron /tmp/heron/heron-install.sh \ - && rm /usr/local/heron/dist/heron-core.tar.gz +# run Heron installer +RUN --mount=type=bind,source=artifacts,target=/tmp/heron /tmp/heron/heron-install.sh && \ + rm /usr/local/heron/dist/heron-core.tar.gz && \ + rm -rf /opt/heron/heron-core/lib/scheduler/heron-local-scheduler.jar && \ + rm -rf /opt/heron/heron-core/lib/scheduler/heron-mesos-scheduler.jar && \ + rm -rf /opt/heron/heron-core/lib/scheduler/heron-slurm-scheduler.jar WORKDIR /heron diff --git a/docker/dist/Dockerfile.dist.debian10 b/docker/dist/Dockerfile.dist.debian10 index 1aa1bec..38fd07c 100644 --- a/docker/dist/Dockerfile.dist.debian10 +++ b/docker/dist/Dockerfile.dist.debian10 @@ -17,6 +17,9 @@ FROM openjdk:11-jdk-slim-buster +ENV LC_ALL C.UTF-8 +ENV LANG C.UTF-8 + RUN apt-get update \ && apt-get -y install \ curl \ @@ -27,17 +30,15 @@ RUN apt-get update \ unzip \ && apt-get clean -ADD artifacts /heron - -WORKDIR /heron - -# run heron installer -RUN /heron/heron-install.sh && \ - rm -rf /heron/heron-install.sh && \ +# run Heron installer +RUN --mount=type=bind,source=artifacts,target=/tmp/heron /tmp/heron/heron-install.sh && \ + rm /usr/local/heron/dist/heron-core.tar.gz && \ rm -rf /opt/heron/heron-core/lib/scheduler/heron-local-scheduler.jar && \ rm -rf /opt/heron/heron-core/lib/scheduler/heron-mesos-scheduler.jar && \ rm -rf /opt/heron/heron-core/lib/scheduler/heron-slurm-scheduler.jar +WORKDIR /heron + RUN ln -s /usr/local/heron/dist/heron-core /heron \ && mkdir -p /heron/heron-tools \ && ln -s /usr/local/heron/bin /heron/heron-tools \ @@ -51,14 +52,11 @@ RUN ln -s /usr/local/heron/dist/heron-core /heron \ ENV HERON_HOME /heron/heron-core/ RUN export HERON_HOME -# install zookeeper +# install Zookeeper ARG ZK_DIST=zookeeper-3.5.8 -ADD dist/scripts /opt/heron-docker/scripts -RUN sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST +RUN --mount=type=bind,source=dist,target=/opt/heron-docker/ sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST ADD dist/conf/zookeeper.conf /opt/zookeeper/conf/zookeeper.conf ADD dist/conf/sandbox.conf /etc/supervisor/conf.d/ -ENV LC_ALL C.UTF-8 -ENV LANG C.UTF-8 diff --git a/docker/dist/Dockerfile.dist.debian9 b/docker/dist/Dockerfile.dist.debian9 index 33ac950..59533bd 100644 --- a/docker/dist/Dockerfile.dist.debian9 +++ b/docker/dist/Dockerfile.dist.debian9 @@ -15,8 +15,12 @@ # specific language governing permissions and limitations # under the License. +#syntax=docker/dockerfile:1.2 FROM openjdk:11-jdk-slim-stretch +ENV LC_ALL C.UTF-8 +ENV LANG C.UTF-8 + RUN apt-get -y update \ && apt-get -y install \ curl \ @@ -28,17 +32,15 @@ RUN apt-get -y update \ && apt-get clean all \ && rm -rf /var/lib/apt/lists/* -ADD artifacts /heron - -WORKDIR /heron - -# run heron installer -RUN /heron/heron-install.sh && \ - rm -rf /heron/heron-install.sh && \ +# run Heron installer +RUN --mount=type=bind,source=artifacts,target=/tmp/heron /tmp/heron/heron-install.sh && \ + rm /usr/local/heron/dist/heron-core.tar.gz && \ rm -rf /opt/heron/heron-core/lib/scheduler/heron-local-scheduler.jar && \ rm -rf /opt/heron/heron-core/lib/scheduler/heron-mesos-scheduler.jar && \ rm -rf /opt/heron/heron-core/lib/scheduler/heron-slurm-scheduler.jar +WORKDIR /heron + RUN ln -s /usr/local/heron/dist/heron-core /heron \ && mkdir -p /heron/heron-tools \ && ln -s /usr/local/heron/bin /heron/heron-tools \ @@ -52,14 +54,10 @@ RUN ln -s /usr/local/heron/dist/heron-core /heron \ ENV HERON_HOME /heron/heron-core/ RUN export HERON_HOME -# install zookeeper +# install Zookeeper ARG ZK_DIST=zookeeper-3.5.8 -ADD dist/scripts /opt/heron-docker/scripts -RUN sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST +RUN --mount=type=bind,source=dist,target=/opt/heron-docker/ sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST ADD dist/conf/zookeeper.conf /opt/zookeeper/conf/zookeeper.conf ADD dist/conf/sandbox.conf /etc/supervisor/conf.d/ - -ENV LC_ALL C.UTF-8 -ENV LANG C.UTF-8 diff --git a/docker/dist/Dockerfile.dist.ubuntu14.04 b/docker/dist/Dockerfile.dist.ubuntu14.04 deleted file mode 100644 index b8108f6..0000000 --- a/docker/dist/Dockerfile.dist.ubuntu14.04 +++ /dev/null @@ -1,66 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -FROM ubuntu:14.04 - -RUN apt-get -y update \ - && apt-get -y install \ - curl \ - netcat-openbsd \ - python3 \ - python3-distutils \ - software-properties-common \ - supervisor \ - unzip \ - && apt-get clean - -RUN add-apt-repository ppa:openjdk-r/ppa \ - && apt-get -y update \ - && apt-get -y install openjdk-11-jdk-headless \ - && apt-get clean - -ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64 -RUN update-ca-certificates -f - -ADD artifacts /heron - -WORKDIR /heron - -# run heron installer -RUN /heron/heron-install.sh - -RUN ln -s /usr/local/heron/dist/heron-core /heron \ - && mkdir -p /heron/heron-tools \ - && ln -s /usr/local/heron/bin /heron/heron-tools \ - && ln -s /usr/local/heron/conf /heron/heron-tools \ - && ln -s /usr/local/heron/dist /heron/heron-tools \ - && ln -s /usr/local/heron/lib /heron/heron-tools \ - && ln -s /usr/local/heron/release.yaml /heron/heron-tools \ - && ln -s /usr/local/heron/examples /heron \ - && ln -s /usr/local/heron/release.yaml /heron - -ENV HERON_HOME /heron/heron-core/ -RUN export HERON_HOME - -# install zookeeper -ARG ZK_DIST=zookeeper-3.5.8 -ADD dist/scripts /opt/heron-docker/scripts - -RUN sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST - -ADD dist/conf/zookeeper.conf /opt/zookeeper/conf/zookeeper.conf -ADD dist/conf/sandbox.conf /etc/supervisor/conf.d/ diff --git a/docker/dist/Dockerfile.dist.ubuntu16.04 b/docker/dist/Dockerfile.dist.ubuntu16.04 deleted file mode 100644 index 7a4357d..0000000 --- a/docker/dist/Dockerfile.dist.ubuntu16.04 +++ /dev/null @@ -1,72 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -FROM ubuntu:16.04 - -RUN apt-get -y update \ - && apt-get install -y \ - curl \ - netcat-openbsd \ - python3 \ - python3-distutils \ - software-properties-common \ - 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 \ - && apt-get clean - -ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64 -RUN update-ca-certificates -f - -ADD artifacts /heron - -WORKDIR /heron - -# run heron installer -RUN /heron/heron-install.sh \ - && rm -f /heron/heron-install.sh - -RUN ln -s /usr/local/heron/dist/heron-core /heron \ - && mkdir -p /heron/heron-tools \ - && ln -s /usr/local/heron/bin /heron/heron-tools \ - && ln -s /usr/local/heron/conf /heron/heron-tools \ - && ln -s /usr/local/heron/dist /heron/heron-tools \ - && ln -s /usr/local/heron/lib /heron/heron-tools \ - && ln -s /usr/local/heron/release.yaml /heron/heron-tools \ - && ln -s /usr/local/heron/examples /heron \ - && ln -s /usr/local/heron/release.yaml /heron - -ENV HERON_HOME /heron/heron-core/ -RUN export HERON_HOME - -# install zookeeper -ARG ZK_DIST=zookeeper-3.5.8 -ADD dist/scripts /opt/heron-docker/scripts - -RUN sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST - -ADD dist/conf/zookeeper.conf /opt/zookeeper/conf/zookeeper.conf -ADD dist/conf/sandbox.conf /etc/supervisor/conf.d/ - -ENV LC_ALL C.UTF-8 -ENV LANG C.UTF-8 diff --git a/docker/dist/Dockerfile.dist.ubuntu18.04 b/docker/dist/Dockerfile.dist.ubuntu18.04 index 620df60..3b368a0 100644 --- a/docker/dist/Dockerfile.dist.ubuntu18.04 +++ b/docker/dist/Dockerfile.dist.ubuntu18.04 @@ -17,6 +17,9 @@ FROM ubuntu:18.04 +ENV LC_ALL C.UTF-8 +ENV LANG C.UTF-8 + RUN apt-get -y update \ && apt-get -y install \ curl \ @@ -31,14 +34,15 @@ RUN apt-get -y update \ ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64 RUN update-ca-certificates -f -ADD artifacts /heron +# run Heron installer +RUN --mount=type=bind,source=artifacts,target=/tmp/heron /tmp/heron/heron-install.sh && \ + rm /usr/local/heron/dist/heron-core.tar.gz && \ + rm -rf /opt/heron/heron-core/lib/scheduler/heron-local-scheduler.jar && \ + rm -rf /opt/heron/heron-core/lib/scheduler/heron-mesos-scheduler.jar && \ + rm -rf /opt/heron/heron-core/lib/scheduler/heron-slurm-scheduler.jar WORKDIR /heron -# run heron installers -RUN /heron/heron-install.sh \ - && rm -f /heron/heron-install.sh - RUN ln -s /usr/local/heron/dist/heron-core /heron \ && mkdir -p /heron/heron-tools \ && ln -s /usr/local/heron/bin /heron/heron-tools \ @@ -52,14 +56,10 @@ RUN ln -s /usr/local/heron/dist/heron-core /heron \ ENV HERON_HOME /heron/heron-core/ RUN export HERON_HOME -# install zookeeper +# install Zookeeper ARG ZK_DIST=zookeeper-3.5.8 -ADD dist/scripts /opt/heron-docker/scripts -RUN sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST +RUN --mount=type=bind,source=dist,target=/opt/heron-docker/ sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST ADD dist/conf/zookeeper.conf /opt/zookeeper/conf/zookeeper.conf ADD dist/conf/sandbox.conf /etc/supervisor/conf.d/ - -ENV LC_ALL C.UTF-8 -ENV LANG C.UTF-8 diff --git a/docker/dist/Dockerfile.dist.ubuntu20.04 b/docker/dist/Dockerfile.dist.ubuntu20.04 index 36a3afd..016a699 100644 --- a/docker/dist/Dockerfile.dist.ubuntu20.04 +++ b/docker/dist/Dockerfile.dist.ubuntu20.04 @@ -19,6 +19,9 @@ FROM ubuntu:20.04 ARG DEBIAN_FRONTEND=noninteractive +ENV LC_ALL C.UTF-8 +ENV LANG C.UTF-8 + RUN apt-get -y update \ && apt-get -y install \ curl \ @@ -33,14 +36,15 @@ RUN apt-get -y update \ ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64 RUN update-ca-certificates -f -ADD artifacts /heron +# run Heron installer +RUN --mount=type=bind,source=artifacts,target=/tmp/heron /tmp/heron/heron-install.sh && \ + rm /usr/local/heron/dist/heron-core.tar.gz && \ + rm -rf /opt/heron/heron-core/lib/scheduler/heron-local-scheduler.jar && \ + rm -rf /opt/heron/heron-core/lib/scheduler/heron-mesos-scheduler.jar && \ + rm -rf /opt/heron/heron-core/lib/scheduler/heron-slurm-scheduler.jar WORKDIR /heron -# run heron installers -RUN /heron/heron-install.sh \ - && rm -f /heron/heron-install.sh - RUN ln -s /usr/local/heron/dist/heron-core /heron \ && mkdir -p /heron/heron-tools \ && ln -s /usr/local/heron/bin /heron/heron-tools \ @@ -54,14 +58,10 @@ RUN ln -s /usr/local/heron/dist/heron-core /heron \ ENV HERON_HOME /heron/heron-core/ RUN export HERON_HOME -# install zookeeper +# install Zookeeper ARG ZK_DIST=zookeeper-3.5.8 -ADD dist/scripts /opt/heron-docker/scripts -RUN sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST +RUN --mount=type=bind,source=dist,target=/opt/heron-docker/ sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST ADD dist/conf/zookeeper.conf /opt/zookeeper/conf/zookeeper.conf ADD dist/conf/sandbox.conf /etc/supervisor/conf.d/ - -ENV LC_ALL C.UTF-8 -ENV LANG C.UTF-8
