You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by GitBox <gi...@apache.org> on 2018/08/14 18:46:34 UTC
[GitHub] nlu90 closed pull request #2975: Docker Ubuntu tweaks
nlu90 closed pull request #2975: Docker Ubuntu tweaks
URL: https://github.com/apache/incubator-heron/pull/2975
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/docker/base/Dockerfile.base.debian8 b/docker/base/Dockerfile.base.debian9
similarity index 100%
rename from docker/base/Dockerfile.base.debian8
rename to docker/base/Dockerfile.base.debian9
diff --git a/docker/compile/Dockerfile.debian8 b/docker/compile/Dockerfile.debian9
similarity index 100%
rename from docker/compile/Dockerfile.debian8
rename to docker/compile/Dockerfile.debian9
diff --git a/docker/compile/Dockerfile.ubuntu14.04 b/docker/compile/Dockerfile.ubuntu14.04
index c0b6aa50f2..4282a00ba4 100644
--- a/docker/compile/Dockerfile.ubuntu14.04
+++ b/docker/compile/Dockerfile.ubuntu14.04
@@ -4,6 +4,11 @@ FROM ubuntu:14.04
ENV TARGET_PLATFORM ubuntu
ENV bazelVersion 0.14.1
+RUN apt-get update && apt-get install -y software-properties-common
+
+RUN add-apt-repository ppa:george-edison55/cmake-3.x
+RUN add-apt-repository ppa:openjdk-r/ppa
+
RUN apt-get update && apt-get -y install \
automake \
build-essential \
@@ -14,17 +19,12 @@ RUN apt-get update && apt-get -y install \
python \
python2.7-dev \
python-software-properties \
- software-properties-common \
python-setuptools \
zip \
unzip \
- wget
-
-RUN add-apt-repository ppa:george-edison55/cmake-3.x && apt-get -y update && \
- apt-get -y install cmake
-
-RUN add-apt-repository ppa:openjdk-r/ppa && apt-get -y update
-RUN apt-get -y install openjdk-8-jdk
+ wget \
+ cmake \
+ openjdk-8-jdk-headless
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
diff --git a/docker/compile/Dockerfile.ubuntu15.10 b/docker/compile/Dockerfile.ubuntu15.10
deleted file mode 100644
index ee9fa2f2d7..0000000000
--- a/docker/compile/Dockerfile.ubuntu15.10
+++ /dev/null
@@ -1,34 +0,0 @@
-FROM ubuntu:15.10
-
-# This is passed to the heron build command via the --config flag
-ENV TARGET_PLATFORM ubuntu
-ENV bazelVersion 0.14.1
-
-RUN apt-get update && apt-get -y install \
- automake \
- build-essential \
- cmake \
- curl \
- libssl-dev \
- git \
- libtool \
- libtool-bin \
- python \
- python2.7-dev \
- python-software-properties \
- software-properties-common \
- python-setuptools \
- zip \
- unzip \
- wget
-
-RUN apt-get -y install openjdk-8-jdk
-
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
-
-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 \
- && /tmp/bazel.sh
-
-ADD bazelrc /root/.bazelrc
-ADD scripts/compile-platform.sh /compile-platform.sh
diff --git a/docker/compile/Dockerfile.ubuntu16.04 b/docker/compile/Dockerfile.ubuntu16.04
index ade285c19d..0d17f1f87b 100644
--- a/docker/compile/Dockerfile.ubuntu16.04
+++ b/docker/compile/Dockerfile.ubuntu16.04
@@ -23,7 +23,7 @@ RUN apt-get update && apt-get -y install \
unzip \
wget
-RUN apt-get -y install openjdk-8-jdk
+RUN apt-get update && apt-get -y install openjdk-8-jdk-headless
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
diff --git a/docker/dist/Dockerfile.dist.debian8 b/docker/dist/Dockerfile.dist.debian9
similarity index 100%
rename from docker/dist/Dockerfile.dist.debian8
rename to docker/dist/Dockerfile.dist.debian9
diff --git a/docker/dist/Dockerfile.dist.ubuntu14.04 b/docker/dist/Dockerfile.dist.ubuntu14.04
index 56005c54d3..996ccd9367 100644
--- a/docker/dist/Dockerfile.dist.ubuntu14.04
+++ b/docker/dist/Dockerfile.dist.ubuntu14.04
@@ -5,11 +5,10 @@ RUN apt-get -y update && apt-get -y install \
unzip \
software-properties-common \
supervisor \
- curl && \
- apt-get clean all
+ curl
RUN add-apt-repository ppa:openjdk-r/ppa && apt-get -y update && \
- apt-get -y install openjdk-8-jdk && apt-get clean all
+ apt-get -y install openjdk-8-jdk
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
RUN update-ca-certificates -f
diff --git a/docker/dist/Dockerfile.dist.ubuntu15.10 b/docker/dist/Dockerfile.dist.ubuntu15.10
deleted file mode 100644
index 60758ada31..0000000000
--- a/docker/dist/Dockerfile.dist.ubuntu15.10
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM ubuntu:16.04
-
-RUN apt-get update
-RUN apt-get -y install python ; apt-get clean all
-RUN apt-get -y install unzip ; apt-get clean all
-RUN apt-get -y install software-properties-common ; apt-get clean all
-RUN apt-get -y install curl ; apt-get clean all
-RUN apt-get -y install supervisor; apt-get clean all
-
-RUN apt-get -y install openjdk-8-jdk; apt-get clean all
-
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
-RUN update-ca-certificates -f
-
-ADD artifacts /heron
-
-WORKDIR /heron
-
-# run heron installer
-RUN /heron/heron-install.sh
-
-RUN tar --strip-components=1 -m -zxvf /heron/heron-core.tar.gz -C /heron
-
-RUN rm -f /heron/heron-tools-install.sh
-RUN rm -f /heron/heron-client-install.sh
-RUN rm -f /heron/heron-core.tar.gz
-
-ENV HERON_HOME /heron/heron-core/
-RUN export HERON_HOME
diff --git a/docker/dist/Dockerfile.dist.ubuntu16.04 b/docker/dist/Dockerfile.dist.ubuntu16.04
index 60758ada31..e233da9972 100644
--- a/docker/dist/Dockerfile.dist.ubuntu16.04
+++ b/docker/dist/Dockerfile.dist.ubuntu16.04
@@ -1,13 +1,14 @@
FROM ubuntu:16.04
RUN apt-get update
-RUN apt-get -y install python ; apt-get clean all
-RUN apt-get -y install unzip ; apt-get clean all
-RUN apt-get -y install software-properties-common ; apt-get clean all
-RUN apt-get -y install curl ; apt-get clean all
-RUN apt-get -y install supervisor; apt-get clean all
-RUN apt-get -y install openjdk-8-jdk; apt-get clean all
+RUN apt-get -y install \
+ python \
+ unzip \
+ software-properties-common \
+ curl \
+ supervisor \
+ openjdk-8-jdk-headless
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
RUN update-ca-certificates -f
diff --git a/docker/scripts/build-artifacts.sh b/docker/scripts/build-artifacts.sh
index 925bc027ac..73697bc2bb 100755
--- a/docker/scripts/build-artifacts.sh
+++ b/docker/scripts/build-artifacts.sh
@@ -150,7 +150,7 @@ case $# in
echo " "
echo "Script to build heron artifacts for different platforms"
echo " "
- echo "Platforms Supported: darwin, ubuntu14.04, ubuntu15.10, ubuntu16.04 centos7 debian8"
+ echo "Platforms Supported: darwin, ubuntu14.04, ubuntu16.04, centos7, debian9"
echo " "
echo "Example:"
echo " ./build-artifacts.sh ubuntu14.04 0.12.0 ."
diff --git a/docker/scripts/build-base.sh b/docker/scripts/build-base.sh
index 6b0e07c6b8..18bbc1bd1a 100755
--- a/docker/scripts/build-base.sh
+++ b/docker/scripts/build-base.sh
@@ -75,7 +75,7 @@ case $# in
echo " "
echo "Usage: $0 <platform> <version_string> <output-directory>"
echo " "
- echo "Platforms Supported: debian8, ubuntu14.04, centos7"
+ echo "Platforms Supported: debian9, ubuntu14.04, ubuntu16.04, centos7"
echo " "
echo "Example:"
echo " ./build-base.sh ubuntu14.04 0.12.0 ~/ubuntu"
diff --git a/docker/scripts/build-docker.sh b/docker/scripts/build-docker.sh
index f53496a40c..4ba32b2c9b 100755
--- a/docker/scripts/build-docker.sh
+++ b/docker/scripts/build-docker.sh
@@ -72,7 +72,7 @@ case $# in
echo " "
echo "Usage: $0 <platform> <version_string> <artifact-directory> "
echo " "
- echo "Platforms Supported: ubuntu14.04, ubuntu15.10, ubuntu16.04 centos7 debian8"
+ echo "Platforms Supported: ubuntu14.04, ubuntu16.04, centos7, debian8"
echo " "
echo "Example:"
echo " ./build-docker.sh ubuntu14.04 0.12.0 ~/ubuntu"
diff --git a/docker/scripts/build-exec-docker.sh b/docker/scripts/build-exec-docker.sh
index f8b8559203..158c38e796 100755
--- a/docker/scripts/build-exec-docker.sh
+++ b/docker/scripts/build-exec-docker.sh
@@ -70,7 +70,7 @@ case $# in
*)
echo "Usage: $0 <platform> <version_string> <output-directory> "
echo " "
- echo "Platforms Supported: ubuntu14.04, ubuntu15.10, ubuntu16.04 centos7"
+ echo "Platforms Supported: ubuntu14.04, ubuntu16.04, debian9, centos7"
echo " "
echo "Example:"
echo " ./build-exec-docker.sh ubuntu14.04 0.12.0 ."
diff --git a/docker/scripts/ci-docker.sh b/docker/scripts/ci-docker.sh
index a45c995fc0..94c205b9b7 100755
--- a/docker/scripts/ci-docker.sh
+++ b/docker/scripts/ci-docker.sh
@@ -127,7 +127,7 @@ case $# in
*)
echo "Usage: $0 <operation> <platform> <version_string> <tag-prefix> <input-output-directory> "
echo " "
- echo "Platforms Supported: latest ubuntu14.04, ubuntu15.10, ubuntu16.04 centos7"
+ echo "Platforms Supported: latest, ubuntu14.04, ubuntu16.04, centos7, debian9"
echo " "
echo "Example:"
echo " $0 build ubuntu14.04 0.12.0 heron ."
diff --git a/vagrant/.gitignore b/vagrant/.gitignore
new file mode 100644
index 0000000000..dace7081e3
--- /dev/null
+++ b/vagrant/.gitignore
@@ -0,0 +1 @@
+/.vagrant
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services