You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by ka...@apache.org on 2018/07/17 21:20:52 UTC
[incubator-heron] branch master updated: (Ok To Merge) updating
docker scripts (#2963)
This is an automated email from the ASF dual-hosted git repository.
karthikz 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 29d93e5 (Ok To Merge) updating docker scripts (#2963)
29d93e5 is described below
commit 29d93e511bf047511c3d0e214123a15264163394
Author: Josh Fischer <jo...@joshfischer.io>
AuthorDate: Tue Jul 17 16:20:50 2018 -0500
(Ok To Merge) updating docker scripts (#2963)
* updating ubuntu14.04 docker scripts
* clean up
* updating other distros
* adding whitespace
---
docker/dist/Dockerfile.dist.centos7 | 5 ++---
docker/dist/Dockerfile.dist.debian8 | 5 +++--
docker/dist/Dockerfile.dist.ubuntu14.04 | 8 ++------
docker/dist/Dockerfile.dist.ubuntu15.10 | 5 ++---
docker/dist/Dockerfile.dist.ubuntu16.04 | 5 ++---
docker/scripts/build-docker.sh | 16 ++++++----------
6 files changed, 17 insertions(+), 27 deletions(-)
diff --git a/docker/dist/Dockerfile.dist.centos7 b/docker/dist/Dockerfile.dist.centos7
index 57f4ca3..4d188d5 100644
--- a/docker/dist/Dockerfile.dist.centos7
+++ b/docker/dist/Dockerfile.dist.centos7
@@ -17,9 +17,8 @@ ADD artifacts /heron
WORKDIR /heron
-# run heron installers
-RUN /heron/heron-client-install.sh
-RUN /heron/heron-tools-install.sh
+# run heron installer
+RUN /heron/heron-install.sh
RUN mkdir -p /opt/heron && \
tar --strip-components=1 -m -zxvf /heron/heron-core.tar.gz -C /heron
diff --git a/docker/dist/Dockerfile.dist.debian8 b/docker/dist/Dockerfile.dist.debian8
index aa69054..090a56d 100644
--- a/docker/dist/Dockerfile.dist.debian8
+++ b/docker/dist/Dockerfile.dist.debian8
@@ -14,8 +14,9 @@ ADD artifacts /heron
WORKDIR /heron
-# run heron tools install
-RUN /heron/heron-tools-install.sh && \
+
+# run heron installer
+RUN /heron/heron-install.sh && \
tar --strip-components=1 -m -zxvf /heron/heron-core.tar.gz -C /heron && \
rm -rf /heron/heron-core.tar.gz && \
rm -rf /heron/heron-tools-install.sh && \
diff --git a/docker/dist/Dockerfile.dist.ubuntu14.04 b/docker/dist/Dockerfile.dist.ubuntu14.04
index b66b54b..56005c5 100644
--- a/docker/dist/Dockerfile.dist.ubuntu14.04
+++ b/docker/dist/Dockerfile.dist.ubuntu14.04
@@ -18,15 +18,11 @@ ADD artifacts /heron
WORKDIR /heron
-# run heron installers
-RUN /heron/heron-client-install.sh && /heron/heron-tools-install.sh
+# 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 && \
- rm -f /heron/heron-client-install.sh && \
- rm -f /heron/heron-core.tar.gz
-
ENV HERON_HOME /heron/heron-core/
# install zookeeper
diff --git a/docker/dist/Dockerfile.dist.ubuntu15.10 b/docker/dist/Dockerfile.dist.ubuntu15.10
index f9ffbfb..60758ad 100644
--- a/docker/dist/Dockerfile.dist.ubuntu15.10
+++ b/docker/dist/Dockerfile.dist.ubuntu15.10
@@ -16,9 +16,8 @@ ADD artifacts /heron
WORKDIR /heron
-# run heron installers
-RUN /heron/heron-client-install.sh
-RUN /heron/heron-tools-install.sh
+# run heron installer
+RUN /heron/heron-install.sh
RUN tar --strip-components=1 -m -zxvf /heron/heron-core.tar.gz -C /heron
diff --git a/docker/dist/Dockerfile.dist.ubuntu16.04 b/docker/dist/Dockerfile.dist.ubuntu16.04
index f9ffbfb..60758ad 100644
--- a/docker/dist/Dockerfile.dist.ubuntu16.04
+++ b/docker/dist/Dockerfile.dist.ubuntu16.04
@@ -16,9 +16,8 @@ ADD artifacts /heron
WORKDIR /heron
-# run heron installers
-RUN /heron/heron-client-install.sh
-RUN /heron/heron-tools-install.sh
+# run heron installer
+RUN /heron/heron-install.sh
RUN tar --strip-components=1 -m -zxvf /heron/heron-core.tar.gz -C /heron
diff --git a/docker/scripts/build-docker.sh b/docker/scripts/build-docker.sh
index 4616b8f..f53496a 100755
--- a/docker/scripts/build-docker.sh
+++ b/docker/scripts/build-docker.sh
@@ -20,6 +20,7 @@ trap cleanup EXIT
setup_scratch_dir() {
if [ ! -f "$1" ]; then
+
mkdir $1
mkdir $1/artifacts
fi
@@ -38,30 +39,25 @@ run_build() {
setup_scratch_dir $SCRATCH_DIR
# need to copy artifacts locally
- TOOLS_FILE="$OUTPUT_DIRECTORY/heron-tools-install-$HERON_VERSION-$TARGET_PLATFORM.sh"
- TOOLS_OUT_FILE="$SCRATCH_DIR/artifacts/heron-tools-install.sh"
-
- CLIENT_FILE="$OUTPUT_DIRECTORY/heron-client-install-$HERON_VERSION-$TARGET_PLATFORM.sh"
- CLIENT_OUT_FILE="$SCRATCH_DIR/artifacts/heron-client-install.sh"
-
CORE_FILE="$OUTPUT_DIRECTORY/heron-core-$HERON_VERSION-$TARGET_PLATFORM.tar.gz"
CORE_OUT_FILE="$SCRATCH_DIR/artifacts/heron-core.tar.gz"
- cp $TOOLS_FILE $TOOLS_OUT_FILE
- cp $CORE_FILE $CORE_OUT_FILE
+ ALL_FILE="$OUTPUT_DIRECTORY/heron-install.sh"
+ ALL_OUT_FILE="$SCRATCH_DIR/artifacts/heron-install.sh"
+ cp $CORE_FILE $CORE_OUT_FILE
+ cp $ALL_FILE $ALL_OUT_FILE
export HERON_VERSION
echo "Building docker image with tag:$DOCKER_TAG"
docker build --squash -t "$DOCKER_TAG" -t "$DOCKER_LATEST_TAG" -f "$DOCKER_FILE" "$SCRATCH_DIR"
-
# save the image as a tar file
DOCKER_IMAGE_FILE="$OUTPUT_DIRECTORY/heron-docker-$HERON_VERSION-$TARGET_PLATFORM.tar"
echo "Saving docker image to $DOCKER_IMAGE_FILE"
docker save -o $DOCKER_IMAGE_FILE $DOCKER_TAG
gzip $DOCKER_IMAGE_FILE
-}
+}
case $# in
3)