From ceaa2bf3cbd8bbec5562f2a776884a6ec8e4ece6 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Sun, 26 Feb 2023 17:10:18 +0800 Subject: [PATCH] [KYUUBI #4413] [BUILD] Build docker image should include web UI ### _Why are the changes needed?_ `bin/docker-image-tool.sh` should include `web-ui` when build image ### _How was this patch tested?_ - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible - [x] Add screenshots for manual tests if appropriate ``` build/dist --web-ui cd dist bin/docker-image-tool.sh -t test build cat > conf/kyuubi-defaults.conf << EOF kyuubi.frontend.protocols REST EOF docker run --rm -v $PWD/conf:/opt/kyuubi/conf -p10099:10099 kyuubi:test ``` ![image](https://user-images.githubusercontent.com/26535726/221345080-6cc7f06b-0c02-4dda-8e8d-51a36ca5ea33.png) - [ ] [Run test](https://kyuubi.readthedocs.io/en/master/develop_tools/testing.html#running-tests) locally before make a pull request Closes #4413 from pan3793/web-ui-package. Closes #4413 787f89515 [Cheng Pan] [BUILD] Build docker image should include web UI Authored-by: Cheng Pan Signed-off-by: Cheng Pan --- build/dist | 6 +++--- docker/Dockerfile | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/dist b/build/dist index 0620c7d08..c155dce3f 100755 --- a/build/dist +++ b/build/dist @@ -247,14 +247,15 @@ echo -e "\$ ${BUILD_COMMAND[@]}\n" rm -rf "$DISTDIR" mkdir -p "$DISTDIR/pid" mkdir -p "$DISTDIR/logs" -mkdir -p "$DISTDIR/jars" mkdir -p "$DISTDIR/work" +mkdir -p "$DISTDIR/jars" +mkdir -p "$DISTDIR/beeline-jars" +mkdir -p "$DISTDIR/web-ui" mkdir -p "$DISTDIR/externals/engines/flink" mkdir -p "$DISTDIR/externals/engines/spark" mkdir -p "$DISTDIR/externals/engines/trino" mkdir -p "$DISTDIR/externals/engines/hive" mkdir -p "$DISTDIR/externals/engines/jdbc" -mkdir -p "$DISTDIR/beeline-jars" echo "Kyuubi $VERSION $GITREVSTRING built for" > "$DISTDIR/RELEASE" echo "Java $JAVA_VERSION" >> "$DISTDIR/RELEASE" echo "Scala $SCALA_VERSION" >> "$DISTDIR/RELEASE" @@ -332,7 +333,6 @@ done if [[ "$ENABLE_WEBUI" == "true" ]]; then # Copy web ui dist - mkdir -p "$DISTDIR/web-ui" cp -r "$KYUUBI_HOME/kyuubi-server/web-ui/dist" "$DISTDIR/web-ui/" fi diff --git a/docker/Dockerfile b/docker/Dockerfile index 190500825..0440022de 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -60,6 +60,7 @@ COPY LICENSE NOTICE RELEASE ${KYUUBI_HOME}/ COPY bin ${KYUUBI_HOME}/bin COPY jars ${KYUUBI_HOME}/jars COPY beeline-jars ${KYUUBI_HOME}/beeline-jars +COPY web-ui ${KYUUBI_HOME}/web-ui COPY externals/engines/spark ${KYUUBI_HOME}/externals/engines/spark WORKDIR ${KYUUBI_HOME}