This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new df2cb53 add a build/ folder symlink to bin_dist (#7719)
df2cb53 is described below
commit df2cb534b9fa48b34d8ddc462d58287ec71e0bc0
Author: Rong Rong <[email protected]>
AuthorDate: Thu Feb 3 11:04:51 2022 -0800
add a build/ folder symlink to bin_dist (#7719)
* add a build/ folder symlink to bin_dist
* change the quickstart guide test to verify that the build/ symlink folder
is correctly generated
Co-authored-by: Rong Rong <[email protected]>
---
.github/workflows/scripts/.pinot_quickstart.sh | 2 +-
.gitignore | 3 +++
README.md | 2 +-
docker/images/pinot/Dockerfile | 2 +-
pinot-distribution/pom.xml | 37 ++++++++++++++++++++++++++
5 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/scripts/.pinot_quickstart.sh
b/.github/workflows/scripts/.pinot_quickstart.sh
index 9508f66..dfda691 100755
--- a/.github/workflows/scripts/.pinot_quickstart.sh
+++ b/.github/workflows/scripts/.pinot_quickstart.sh
@@ -82,7 +82,7 @@ if [ "${PASS}" != 1 ]; then
fi
# Quickstart
-DIST_BIN_DIR=`ls -d pinot-distribution/target/apache-pinot-*/apache-pinot-*`
+DIST_BIN_DIR=`ls -d build/`
cd "${DIST_BIN_DIR}"
# Test standalone pinot. Configure JAVA_OPTS for smaller memory, and don't use
System.exit
diff --git a/.gitignore b/.gitignore
index 466e2ae..415ade2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,6 @@ yarn-error.log*
#quickstart files
quickstart*
+
+#build symlink directory
+build*
diff --git a/README.md b/README.md
index d5a4007..7005d61 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,7 @@ $ cd pinot
$ mvn clean install -DskipTests -Pbin-dist
# Run the Quick Demo
-$ cd
pinot-distribution/target/apache-pinot-<version>-SNAPSHOT-bin/apache-pinot-<version>-SNAPSHOT-bin
+$ cd build/
$ bin/quick-start-batch.sh
```
diff --git a/docker/images/pinot/Dockerfile b/docker/images/pinot/Dockerfile
index 73baafe..ed2ee14 100644
--- a/docker/images/pinot/Dockerfile
+++ b/docker/images/pinot/Dockerfile
@@ -58,7 +58,7 @@ RUN git clone ${PINOT_GIT_URL} ${PINOT_BUILD_DIR} && \
mvn install package -DskipTests -Pbin-dist -Pbuild-shaded-jar
-Dkafka.version=${KAFKA_VERSION} -Djdk.version=${JDK_VERSION} && \
mkdir -p ${PINOT_HOME}/configs && \
mkdir -p ${PINOT_HOME}/data && \
- cp -r pinot-distribution/target/apache-pinot-*-bin/apache-pinot-*-bin/*
${PINOT_HOME}/. && \
+ cp -r build/* ${PINOT_HOME}/. && \
chmod +x ${PINOT_HOME}/bin/*.sh
FROM ${OPENJDK_IMAGE}:${JAVA_VERSION}-jdk-slim
diff --git a/pinot-distribution/pom.xml b/pinot-distribution/pom.xml
index 5d3154c..7474856 100644
--- a/pinot-distribution/pom.xml
+++ b/pinot-distribution/pom.xml
@@ -262,6 +262,43 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
+ <!-- Create symlink "build" to the root directory (Unix only) -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.5.0</version>
+ <executions>
+ <execution>
+ <id>remove-build-directory</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>rm</executable>
+ <arguments>
+ <argument>-f</argument>
+ <argument>${project.basedir}/../build</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>create-build-directory</id>
+ <phase>package</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>ln</executable>
+ <arguments>
+ <argument>-sfn</argument>
+
<argument>${project.basedir}/target/apache-pinot-${project.version}-bin/apache-pinot-${project.version}-bin</argument>
+ <argument>${project.basedir}/../build</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
