From a25b89dc857fa1033cbecc183d58ba5dbadf5126 Mon Sep 17 00:00:00 2001 From: congyi <15605187270@163.com> Date: Sun, 8 Oct 2023 18:27:05 +0800 Subject: [PATCH 1/4] fix docker file --- ci/scripts/docker-hdfs.sh | 2 +- docker/Dockerfile.hdfs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/scripts/docker-hdfs.sh b/ci/scripts/docker-hdfs.sh index 5b46c3be50397..929a2177f72ff 100644 --- a/ci/scripts/docker-hdfs.sh +++ b/ci/scripts/docker-hdfs.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Exits as soon as any line fails. -set -euo pipefail +set -eu pipefail ghcraddr="ghcr.io/risingwavelabs/risingwave" dockerhubaddr="risingwavelabs/risingwave" diff --git a/docker/Dockerfile.hdfs b/docker/Dockerfile.hdfs index 23b6cf802fc4f..4f7f58633d7f0 100644 --- a/docker/Dockerfile.hdfs +++ b/docker/Dockerfile.hdfs @@ -44,7 +44,7 @@ ENV JAVA_HOME ${JAVA_HOME_PATH} ENV LD_LIBRARY_PATH ${JAVA_HOME_PATH}/lib/server:${LD_LIBRARY_PATH} RUN cargo fetch && \ - cargo build -p risingwave_cmd_all --release --features "rw-static-link" && \ + cargo build -p risingwave_cmd_all --release --features "rw-static-link" hdfs-backend && \ mkdir -p /risingwave/bin && \ mv /risingwave/target/release/risingwave /risingwave/bin/ && \ mv /risingwave/target/release/risingwave.dwp /risingwave/bin/ && \ From 717684f73e5e6e76fb8cc2cb767cf294061ec89f Mon Sep 17 00:00:00 2001 From: congyi <15605187270@163.com> Date: Sun, 8 Oct 2023 18:38:30 +0800 Subject: [PATCH 2/4] minor --- docker/Dockerfile.hdfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.hdfs b/docker/Dockerfile.hdfs index 4f7f58633d7f0..ff18d9a92784e 100644 --- a/docker/Dockerfile.hdfs +++ b/docker/Dockerfile.hdfs @@ -44,7 +44,7 @@ ENV JAVA_HOME ${JAVA_HOME_PATH} ENV LD_LIBRARY_PATH ${JAVA_HOME_PATH}/lib/server:${LD_LIBRARY_PATH} RUN cargo fetch && \ - cargo build -p risingwave_cmd_all --release --features "rw-static-link" hdfs-backend && \ + cargo build -p risingwave_cmd_all --release -p risingwave_object_store --features hdfs-backend --features "rw-static-link" && \ mkdir -p /risingwave/bin && \ mv /risingwave/target/release/risingwave /risingwave/bin/ && \ mv /risingwave/target/release/risingwave.dwp /risingwave/bin/ && \ From 33348fbf96afb0498137fef295e39829eef0ca69 Mon Sep 17 00:00:00 2001 From: congyi <15605187270@163.com> Date: Wed, 11 Oct 2023 19:10:31 +0800 Subject: [PATCH 3/4] minor --- docker/Dockerfile.hdfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.hdfs b/docker/Dockerfile.hdfs index ff18d9a92784e..b23c350038b88 100644 --- a/docker/Dockerfile.hdfs +++ b/docker/Dockerfile.hdfs @@ -94,5 +94,5 @@ ENV RW_DASHBOARD_UI_PATH /risingwave/ui # Set default connector libs path ENV CONNECTOR_LIBS_PATH /risingwave/bin/connector-node/libs -ENTRYPOINT [ "/risingwave/hdfs_env.sh" ] +ENTRYPOINT [ "/risingwave/bin/risingwave" ] CMD [ "playground" ] From c3276c92b6136a305fba4e37b7c20e35b4b9f2be Mon Sep 17 00:00:00 2001 From: congyi <15605187270@163.com> Date: Wed, 11 Oct 2023 20:14:00 +0800 Subject: [PATCH 4/4] minor --- ci/scripts/docker-hdfs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/scripts/docker-hdfs.sh b/ci/scripts/docker-hdfs.sh index 929a2177f72ff..5b46c3be50397 100644 --- a/ci/scripts/docker-hdfs.sh +++ b/ci/scripts/docker-hdfs.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Exits as soon as any line fails. -set -eu pipefail +set -euo pipefail ghcraddr="ghcr.io/risingwavelabs/risingwave" dockerhubaddr="risingwavelabs/risingwave"