This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch cloudbreak
in repository https://gitbox.apache.org/repos/asf/ambari-logsearch.git
commit 4250f99b6e72eb254d1d569cefe6bc0edfce6e77
Author: Oliver Szabo <oleew...@gmail.com>
AuthorDate: Fri Oct 5 00:34:57 2018 +0200
AMBARI-24739. Add contribution guide to Log Search.
---
Makefile | 9 +++++++++
README.md | 27 +++++++++++++++++++++------
2 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 0f026ce..6eb4b22 100644
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,9 @@ rpm:
deb:
$(MAVEN_BINARY) clean package -Dbuild-deb -DskipTests
+update-version:
+ $(MAVEN_BINARY) versions:set -DnewVersion=$(new-version)
-DgenerateBackupPoms=false
+
package-jdk8:
$(MAVEN_BINARY) clean package -Djdk.version=1.8
@@ -66,3 +69,9 @@ docker-build:
docker-push:
$(MAVEN_BINARY) clean package docker:build docker:push -DskipTests
-Dlogsearch.docker.tag=$(LOGSEARCH_BUILD_DOCKER_TAG)
+
+docker-dev-start:
+ cd docker && docker-compose up -d
+
+docker-dev-build-and-start:
+ $(MAVEN_BINARY) clean package && cd docker && docker-compose up -d
diff --git a/README.md b/README.md
index 3bab2c3..a2fc3e8 100644
--- a/README.md
+++ b/README.md
@@ -48,15 +48,17 @@ In case if you started the containers separately and if you
would like to access
1. Check out the code from GIT repository
-2. On the logsearch root folder (ambari/ambari-logsearch), please execute the
following Maven command to build RPM/DPKG:
+2. On the logsearch root folder (ambari/ambari-logsearch), please execute the
following make command to build RPM/DPKG:
```bash
-# for building with jdk 8, use -Djdk.version=1.8
-mvn -Dbuild-rpm clean package
+make rpm
+# or for jdk8
+make rpm-jdk8
```
or
```bash
-# for building with jdk 8, use -Djdk.version=1.8
-mvn -Dbuild-deb clean package
+make deb
+# or for jdk8
+make deb-jdk8
```
3. Generated RPM/DPKG files will be found in ambari-logsearch-assembly/target
folder
@@ -75,7 +77,20 @@ mvn clean integration-test -Dselenium-tests failsafe:verify
```
Also you can run from the IDE, but make sure all of the ambari logsearch
modules are built.
+
+## Update version (for release or specific builds)
+
+```bash
+make set-version new-version="2.8.0.0-11"
+```
+
+## Contributing
+
+https://cwiki.apache.org/confluence/display/AMBARI/How+to+Contribute
+
+(That is the ambari contribution guide, everything is the same here except use
ambari-logsearch repository instead of ambari)
+
## License
-- http://ambari.apache.org/license.html
+- http://ambari.apache.org/license.html
- See more at [Ambari repository](https://github.com/apache/ambari)
