You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by xi...@apache.org on 2020/05/25 06:13:09 UTC
[incubator-pinot] branch update_te_docker_build_script created (now
6086a12)
This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a change to branch update_te_docker_build_script
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git.
at 6086a12 Update thirdeye docker image build
This branch includes the following new commits:
new 6086a12 Update thirdeye docker image build
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[incubator-pinot] 01/01: Update thirdeye docker image build
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch update_te_docker_build_script
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit 6086a1276461c098aef3cf382bf8544cf59bc552
Author: Xiang Fu <fx...@gmail.com>
AuthorDate: Sun May 24 23:12:48 2020 -0700
Update thirdeye docker image build
---
docker/images/pinot-thirdeye/Dockerfile | 2 +-
docker/images/pinot-thirdeye/bin/start-thirdeye.sh | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docker/images/pinot-thirdeye/Dockerfile b/docker/images/pinot-thirdeye/Dockerfile
index 712339b..9f060ae 100644
--- a/docker/images/pinot-thirdeye/Dockerfile
+++ b/docker/images/pinot-thirdeye/Dockerfile
@@ -54,7 +54,7 @@ RUN git clone ${PINOT_GIT_URL} ${TE_BUILD_DIR} \
&& mkdir -p ${TE_HOME}/config/default \
&& mkdir -p ${TE_HOME}/bin \
&& cp -rp ${TE_BUILD_DIR}/thirdeye/thirdeye-pinot/config/* ${TE_HOME}/config/default/. \
- && cp ${TE_BUILD_DIR}/thirdeye/thirdeye-pinot/target/thirdeye-pinot-1.0-SNAPSHOT.jar ${TE_HOME}/bin/. \
+ && cp ${TE_BUILD_DIR}/thirdeye/thirdeye-pinot/target/thirdeye-pinot-*-SNAPSHOT.jar ${TE_HOME}/bin/. \
&& rm -rf ${TE_BUILD_DIR}
FROM openjdk:8-jdk-slim
diff --git a/docker/images/pinot-thirdeye/bin/start-thirdeye.sh b/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
index f16169f..f1d1d83 100755
--- a/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
+++ b/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
@@ -26,24 +26,24 @@ else
fi
echo "Starting H2 database server"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar" org.h2.tools.Server -tcp -baseDir "${CONFIG_DIR}/.." &
+java -cp "./bin/thirdeye-pinot-*-SNAPSHOT.jar" org.h2.tools.Server -tcp -baseDir "${CONFIG_DIR}/.." &
sleep 1
echo "Creating ThirdEye database schema"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar" org.h2.tools.RunScript -user "sa" -password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script "zip:./bin/thirdeye-pinot-1.0-SNAPSHOT.jar!/schema/create-schema.sql"
+java -cp "./bin/thirdeye-pinot-*-SNAPSHOT.jar" org.h2.tools.RunScript -user "sa" -password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script "zip:./bin/thirdeye-pinot-*-SNAPSHOT.jar!/schema/create-schema.sql"
if [ -f "${CONFIG_DIR}/bootstrap.sql" ]; then
echo "Running database bootstrap script ${CONFIG_DIR}/bootstrap.sql"
- java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar" org.h2.tools.RunScript -user "sa" -password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script "${CONFIG_DIR}/bootstrap.sql"
+ java -cp "./bin/thirdeye-pinot-*-SNAPSHOT.jar" org.h2.tools.RunScript -user "sa" -password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script "${CONFIG_DIR}/bootstrap.sql"
fi
echo "Running thirdeye backend config: ${CONFIG_DIR}"
[ -f "${CONFIG_DIR}/data-sources/data-sources-config-backend.yml" ] && cp "${CONFIG_DIR}/data-sources/data-sources-config-backend.yml" "${CONFIG_DIR}/data-sources/data-sources-config.yml"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar" org.apache.pinot.thirdeye.anomaly.ThirdEyeAnomalyApplication "${CONFIG_DIR}" &
+java -cp "./bin/thirdeye-pinot-*-SNAPSHOT.jar" org.apache.pinot.thirdeye.anomaly.ThirdEyeAnomalyApplication "${CONFIG_DIR}" &
sleep 10
echo "Running thirdeye frontend config: ${CONFIG_DIR}"
[ -f "${CONFIG_DIR}/data-sources/data-sources-config-frontend.yml" ] && cp "${CONFIG_DIR}/data-sources/data-sources-config-frontend.yml" "${CONFIG_DIR}/data-sources/data-sources-config.yml"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar" org.apache.pinot.thirdeye.dashboard.ThirdEyeDashboardApplication "${CONFIG_DIR}" &
+java -cp "./bin/thirdeye-pinot-*-SNAPSHOT.jar" org.apache.pinot.thirdeye.dashboard.ThirdEyeDashboardApplication "${CONFIG_DIR}" &
wait
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org