Skip to content

Commit

Permalink
Merge pull request #3 from shayaantx/development
Browse files Browse the repository at this point in the history
Various fixes/test cases/etc
  • Loading branch information
shayaantx authored Jan 18, 2020
2 parents 491a0bd + 0c7c4f1 commit 20ad004
Show file tree
Hide file tree
Showing 23 changed files with 776 additions and 345 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ build/
.vscode/
properties*
*.log
dependency-reduced-pom.xml
*.jar
10 changes: 7 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
def dockerFileContents = """
FROM centos:7
RUN yum update; yum clean all;
RUN yum -y install java-1.8.0-openjdk-devel-debug.x86_64; yum -y install java-1.8.0-openjdk-src-debug.x86_64;
RUN yum update clean all
RUN yum -y install java-1.8.0-openjdk-devel.x86_64
RUN yum -y install maven
RUN adduser jenkins
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk
Expand All @@ -14,7 +14,7 @@ def getChangelistDescription() {
def entries = changeLogSets[i].items;
for (int j = 0; j < entries.length; j++) {
def entry = entries[j]
description += "${entry.commitId} by ${entry.author} on ${new Date(entry.timestamp)}: ${entry.msg}";
description += "${entry.commitId} by ${entry.author} on ${new Date(entry.timestamp)}: ${entry.msg}\n";
}
}
return description;
Expand Down Expand Up @@ -59,6 +59,10 @@ node {
sh 'mvn compile'
}

stage("Test") {
sh 'mvn test'
}

stage("Package") {
fileOperations([fileCreateOperation(fileContent: "version=${tag}", fileName: './src/main/resources/version.txt')]);
sh 'mvn package'
Expand Down
15 changes: 14 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ nohup java -jar botdar-release.jar &
```
<br/>

## Docker installation
## Run with Docker

1. Docker images are here https://cloud.docker.com/repository/docker/shayaantx/botdar/general
1. Create a folder on your host called "botdar"
Expand All @@ -74,6 +74,19 @@ docker run -d --name botdar -v /BOTDAR_HOME/properties:/home/botdar/config/prope
docker run -d --name botdar -v /BOTDAR_HOME/properties:/home/botdar/config/properties -v /BOTDAR_HOME/logs:/home/botdar/logs shayaantx/botdar:stable &
```

Or if you want to use docker-compose

```
version: '2.2'
botdar:
image: shayaantx/botdar:latest
container_name: botdar
volumes:
- /BOTDAR_HOME/properties:/home/botdar/config/properties
- /BOTDAR_HOME/logs:/home/botdar/logs
```


<br/>

## Usage
Expand Down
Loading

0 comments on commit 20ad004

Please sign in to comment.