Skip to content
This repository has been archived by the owner on Mar 3, 2023. It is now read-only.

Commit

Permalink
Update zk version to 3.4.14 in dist and install zk in ubuntu 16/18 di… (
Browse files Browse the repository at this point in the history
#3411)

* Update zk version to 3.4.14 in dist and install zk in ubuntu 16/18 dist docker image

* fix path

* Add back docker ARG
  • Loading branch information
nwangtw authored Dec 10, 2019
1 parent c7d1cb9 commit 66c656a
Show file tree
Hide file tree
Showing 8 changed files with 159 additions and 91 deletions.
32 changes: 3 additions & 29 deletions docker/base/Dockerfile.base.debian9
Original file line number Diff line number Diff line change
Expand Up @@ -27,36 +27,10 @@ RUN apt-get -y update && apt-get -y install \
rm -rf /var/lib/apt/lists/*

# install zookeeper
ARG ZK_DIST=zookeeper-3.4.10
ARG ZK_DIST=zookeeper-3.4.14
ADD base/scripts /opt/heron-docker/scripts

RUN curl -O "https://archive.apache.org/dist/zookeeper/$ZK_DIST/$ZK_DIST.tar.gz" \
&& tar -xzf $ZK_DIST.tar.gz -C /opt \
&& rm -r $ZK_DIST.tar.gz \
&& mv /opt/$ZK_DIST /opt/zookeeper \
&& rm -rf /opt/zookeeper/CHANGES.txt \
/opt/zookeeper/README.txt \
/opt/zookeeper/NOTICE.txt \
/opt/zookeeper/CHANGES.txt \
/opt/zookeeper/README_packaging.txt \
/opt/zookeeper/build.xml \
/opt/zookeeper/config \
/opt/zookeeper/contrib \
/opt/zookeeper/dist-maven \
/opt/zookeeper/docs \
/opt/zookeeper/ivy.xml \
/opt/zookeeper/ivysettings.xml \
/opt/zookeeper/recipes \
/opt/zookeeper/src \
/opt/zookeeper/$ZK_DIST.jar.asc \
/opt/zookeeper/$ZK_DIST.jar.md5 \
/opt/zookeeper/$ZK_DIST.jar.sha1
RUN sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST

ADD base/conf/zookeeper.conf /opt/zookeeper/conf/zookeeper.conf
ADD base/conf/sandbox.conf /etc/supervisor/conf.d/

RUN mkdir -p /opt/zookeeper/scripts
ADD base/scripts /opt/zookeeper/scripts
RUN chmod +x /opt/zookeeper/scripts/generate-zookeeper-config.sh && \
chmod +x /opt/zookeeper/scripts/zookeeper-ruok.sh && \
chmod +x /opt/zookeeper/scripts/start-zookeeper.sh && \
chmod +x /opt/zookeeper/scripts/wait-for-zookeeper.sh
60 changes: 60 additions & 0 deletions docker/base/scripts/install-zookeeper.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
#!/usr/bin/env bash
# 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.

if [ "$#" -ne 1 ]; then
echo "Usage: $0 zookeeper-<version-number>"
echo "Example:"
echo "$ $0 zookeeper-3.4.14"
exit 1
fi

ZK_DIST=$1

curl -O "https://archive.apache.org/dist/zookeeper/$ZK_DIST/$ZK_DIST.tar.gz"
tar -xzf ./$ZK_DIST.tar.gz -C /opt
rm ./$ZK_DIST.tar.gz

mv /opt/$ZK_DIST /opt/zookeeper
rm -rf /opt/zookeeper/CHANGES.txt \
/opt/zookeeper/README.txt \
/opt/zookeeper/NOTICE.txt \
/opt/zookeeper/CHANGES.txt \
/opt/zookeeper/README_packaging.txt \
/opt/zookeeper/build.xml \
/opt/zookeeper/config \
/opt/zookeeper/contrib \
/opt/zookeeper/dist-maven \
/opt/zookeeper/docs \
/opt/zookeeper/ivy.xml \
/opt/zookeeper/ivysettings.xml \
/opt/zookeeper/recipes \
/opt/zookeeper/src \
/opt/zookeeper/$ZK_DIST.jar.asc \
/opt/zookeeper/$ZK_DIST.jar.md5 \
/opt/zookeeper/$ZK_DIST.jar.sha1

# copy zk scripts
mkdir -p /opt/zookeeper/scripts
cp /opt/heron-docker/scripts/generate-zookeeper-config.sh /opt/zookeeper/scripts/
chmod +x /opt/heron-docker/scripts/generate-zookeeper-config.sh
cp /opt/heron-docker/scripts/zookeeper-ruok.sh /opt/zookeeper/scripts/
chmod +x /opt/heron-docker/scripts/zookeeper-ruok.sh
cp /opt/heron-docker/scripts/start-zookeeper.sh /opt/zookeeper/scripts/
chmod +x /opt/heron-docker/scripts/
cp /opt/heron-docker/scripts/wait-for-zookeeper.sh /opt/zookeeper/scripts/
chmod +x /opt/heron-docker/scripts/wait-for-zookeeper.sh
9 changes: 9 additions & 0 deletions docker/dist/Dockerfile.dist.centos7
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,12 @@ RUN ln -s /usr/local/heron/dist/heron-core /heron \

ENV HERON_HOME /heron/heron-core/
RUN export HERON_HOME

# install zookeeper
ARG ZK_DIST=zookeeper-3.4.14
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/
33 changes: 4 additions & 29 deletions docker/dist/Dockerfile.dist.debian9
Original file line number Diff line number Diff line change
Expand Up @@ -49,38 +49,13 @@ RUN ln -s /usr/local/heron/dist/heron-core /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.4.10
ARG ZK_DIST=zookeeper-3.4.14
ADD dist/scripts /opt/heron-docker/scripts

RUN curl -O "https://archive.apache.org/dist/zookeeper/$ZK_DIST/$ZK_DIST.tar.gz" \
&& tar -xzf /heron/$ZK_DIST.tar.gz -C /opt \
&& rm -r /heron/$ZK_DIST.tar.gz \
&& mv /opt/$ZK_DIST /opt/zookeeper \
&& rm -rf /opt/zookeeper/CHANGES.txt \
/opt/zookeeper/README.txt \
/opt/zookeeper/NOTICE.txt \
/opt/zookeeper/CHANGES.txt \
/opt/zookeeper/README_packaging.txt \
/opt/zookeeper/build.xml \
/opt/zookeeper/config \
/opt/zookeeper/contrib \
/opt/zookeeper/dist-maven \
/opt/zookeeper/docs \
/opt/zookeeper/ivy.xml \
/opt/zookeeper/ivysettings.xml \
/opt/zookeeper/recipes \
/opt/zookeeper/src \
/opt/zookeeper/$ZK_DIST.jar.asc \
/opt/zookeeper/$ZK_DIST.jar.md5 \
/opt/zookeeper/$ZK_DIST.jar.sha1
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/

RUN mkdir -p /opt/zookeeper/scripts
ADD dist/scripts /opt/zookeeper/scripts
RUN chmod +x /opt/zookeeper/scripts/generate-zookeeper-config.sh \
&& chmod +x /opt/zookeeper/scripts/zookeeper-ruok.sh \
&& chmod +x /opt/zookeeper/scripts/start-zookeeper.sh \
&& chmod +x /opt/zookeeper/scripts/wait-for-zookeeper.sh
36 changes: 4 additions & 32 deletions docker/dist/Dockerfile.dist.ubuntu14.04
Original file line number Diff line number Diff line change
Expand Up @@ -48,41 +48,13 @@ RUN ln -s /usr/local/heron/dist/heron-core /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.4.10
ARG ZK_DIST=zookeeper-3.4.14
ADD dist/scripts /opt/heron-docker/scripts

RUN curl -O "https://archive.apache.org/dist/zookeeper/$ZK_DIST/$ZK_DIST.tar.gz" \
&& tar -xzf /heron/$ZK_DIST.tar.gz -C /opt \
&& rm -r /heron/$ZK_DIST.tar.gz \
&& mv /opt/$ZK_DIST /opt/zookeeper \
&& rm -rf /heron/heron-install.sh \
&& rm -rf /opt/zookeeper/CHANGES.txt \
/opt/zookeeper/README.txt \
/opt/zookeeper/NOTICE.txt \
/opt/zookeeper/CHANGES.txt \
/opt/zookeeper/README_packaging.txt \
/opt/zookeeper/build.xml \
/opt/zookeeper/config \
/opt/zookeeper/contrib \
/opt/zookeeper/dist-maven \
/opt/zookeeper/docs \
/opt/zookeeper/ivy.xml \
/opt/zookeeper/ivysettings.xml \
/opt/zookeeper/recipes \
/opt/zookeeper/src \
/opt/zookeeper/$ZK_DIST.jar.asc \
/opt/zookeeper/$ZK_DIST.jar.md5 \
/opt/zookeeper/$ZK_DIST.jar.sha1
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/

RUN mkdir -p /opt/zookeeper/scripts
ADD dist/scripts /opt/zookeeper/scripts
RUN chmod +x /opt/zookeeper/scripts/generate-zookeeper-config.sh \
&& chmod +x /opt/zookeeper/scripts/zookeeper-ruok.sh \
&& chmod +x /opt/zookeeper/scripts/start-zookeeper.sh \
&& chmod +x /opt/zookeeper/scripts/wait-for-zookeeper.sh

CMD ["supervisord", "-n"]
11 changes: 10 additions & 1 deletion docker/dist/Dockerfile.dist.ubuntu16.04
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,16 @@ RUN ln -s /usr/local/heron/dist/heron-core /heron \
&& 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 \
&& 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.4.14
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/
9 changes: 9 additions & 0 deletions docker/dist/Dockerfile.dist.ubuntu18.04
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,12 @@ RUN ln -s /usr/local/heron/dist/heron-core /heron \

ENV HERON_HOME /heron/heron-core/
RUN export HERON_HOME

# install zookeeper
ARG ZK_DIST=zookeeper-3.4.14
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/
60 changes: 60 additions & 0 deletions docker/dist/scripts/install-zookeeper.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
#!/usr/bin/env bash
# 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.

if [ "$#" -ne 1 ]; then
echo "Usage: $0 zookeeper-<version-number>"
echo "Example:"
echo "$ $0 zookeeper-3.4.14"
exit 1
fi

ZK_DIST=$1

curl -O "https://archive.apache.org/dist/zookeeper/$ZK_DIST/$ZK_DIST.tar.gz"
tar -xzf ./$ZK_DIST.tar.gz -C /opt
rm ./$ZK_DIST.tar.gz

mv /opt/$ZK_DIST /opt/zookeeper
rm -rf /opt/zookeeper/CHANGES.txt \
/opt/zookeeper/README.txt \
/opt/zookeeper/NOTICE.txt \
/opt/zookeeper/CHANGES.txt \
/opt/zookeeper/README_packaging.txt \
/opt/zookeeper/build.xml \
/opt/zookeeper/config \
/opt/zookeeper/contrib \
/opt/zookeeper/dist-maven \
/opt/zookeeper/docs \
/opt/zookeeper/ivy.xml \
/opt/zookeeper/ivysettings.xml \
/opt/zookeeper/recipes \
/opt/zookeeper/src \
/opt/zookeeper/$ZK_DIST.jar.asc \
/opt/zookeeper/$ZK_DIST.jar.md5 \
/opt/zookeeper/$ZK_DIST.jar.sha1

# copy zk scripts
mkdir -p /opt/zookeeper/scripts
cp /opt/heron-docker/scripts/generate-zookeeper-config.sh /opt/zookeeper/scripts/
chmod +x /opt/heron-docker/scripts/generate-zookeeper-config.sh
cp /opt/heron-docker/scripts/zookeeper-ruok.sh /opt/zookeeper/scripts/
chmod +x /opt/heron-docker/scripts/zookeeper-ruok.sh
cp /opt/heron-docker/scripts/start-zookeeper.sh /opt/zookeeper/scripts/
chmod +x /opt/heron-docker/scripts/
cp /opt/heron-docker/scripts/wait-for-zookeeper.sh /opt/zookeeper/scripts/
chmod +x /opt/heron-docker/scripts/wait-for-zookeeper.sh

0 comments on commit 66c656a

Please sign in to comment.