Commit 9c1b6b7c authored by tower's avatar tower

fff

parent c87cca36
...@@ -26,7 +26,7 @@ WORKDIR "/" ...@@ -26,7 +26,7 @@ WORKDIR "/"
RUN set -ex; \ RUN set -ex; \
wget -q "http://www.apache.org/dist/zookeeper/$DISTRO_NAME/$DISTRO_NAME.tar.gz"; \ wget -q "http://www.apache.org/dist/zookeeper/$DISTRO_NAME/$DISTRO_NAME.tar.gz"; \
tar -xzf "$DISTRO_NAME.tar.gz"; \ tar -xzf "$DISTRO_NAME.tar.gz"; \
mv "$DISTRO_NAME/conf/"* "$ZOO_CONF_DIR"; \ mv "/$DISTRO_NAME/conf/"* "$ZOO_CONF_DIR"; \
rm -rf "$GNUPGHOME" "$DISTRO_NAME.tar.gz" rm -rf "$GNUPGHOME" "$DISTRO_NAME.tar.gz"
COPY ./scripts/docker-entrypoint.sh / COPY ./scripts/docker-entrypoint.sh /
......
...@@ -6,7 +6,7 @@ set -e ...@@ -6,7 +6,7 @@ set -e
if [ "$1" = 'zkServer.sh' -a "$(id -u)" = '0' ]; then if [ "$1" = 'zkServer.sh' -a "$(id -u)" = '0' ]; then
chown -R "$ZOO_USER" "$ZOO_DATA_DIR" "$ZOO_DATA_LOG_DIR" chown -R "$ZOO_USER" "$ZOO_DATA_DIR" "$ZOO_DATA_LOG_DIR"
exec su-exec "$ZOO_USER" "$0" "$@" exec su-exec "$ZOO_USER" "$0" "$@"
nohup java -jar /home/$ZOO_USER/zkui/zkui-2.0.jar &
fi fi
# Generate the config only if it doesn't exist # Generate the config only if it doesn't exist
...@@ -32,5 +32,5 @@ fi ...@@ -32,5 +32,5 @@ fi
if [ ! -f "$ZOO_DATA_DIR/myid" ]; then if [ ! -f "$ZOO_DATA_DIR/myid" ]; then
echo "${ZOO_MY_ID:-1}" > "$ZOO_DATA_DIR/myid" echo "${ZOO_MY_ID:-1}" > "$ZOO_DATA_DIR/myid"
fi fi
nohup java -jar /home/$ZOO_USER/zkui/zkui-2.0.jar &
exec "$@" exec "$@"
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment