sebclem/ClaptrapBot
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'devel'

Browse Source
This commit is contained in:
Sebastien 2018-03-01 17:01:38 +01:00
commit 31ce55e626
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -21,13 +21,13 @@ node {
} }
} }
} }
stage('Build image') { stage('Build Docker image') {
/* This builds the actual image; synonymous to /* This builds the actual image; synonymous to
* docker build on the command line */ * docker build on the command line */
app = docker.build("brokenfire/brokendiscordbot",'--build-arg BUILD_NBR=${BUILD_NUMBER} --build-arg BRANCH_NAME=${BRANCH_NAME} --rm=true .') app = docker.build("brokenfire/brokendiscordbot",'--build-arg BUILD_NBR=${BUILD_NUMBER} --build-arg BRANCH_NAME=${BRANCH_NAME} --rm=true .')
} }
stage('Push image') { stage('Push Docker image') {
/* Finally, we'll push the image with two tags: /* Finally, we'll push the image with two tags:
* First, the incremental build number from Jenkins * First, the incremental build number from Jenkins
* Second, the 'latest' tag. * Second, the 'latest' tag.

20
README.md
View File

@ -1,8 +1,10 @@
# BrokenDiscordBot # BrokenDiscordBot
Master:<br/>[![Build Status](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/badge/icon)](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/)
Devel: <br/>[![Build Status](https://jenkins.seb6596.ovh/buildStatus/icon?job=BrokenDiscordBot/devel)](https://jenkins.seb6596.ovh/job/BrokenDiscordBot/job/devel/) Gradle:<br/>
[![Build Status](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/badge/icon)](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/)
Docker:<br/>
[![Build Status](https://jenkins.seb6596.ovh/job/Discord%20Bot%20Docker/job/master/badge/icon)](https://jenkins.seb6596.ovh/job/Discord%20Bot%20Docker/job/master/)
## Install: ## Install:
> The easiest method it's to use docker-compose: > The easiest method it's to use docker-compose:
@ -70,16 +72,8 @@ Devel: <br/>[![Build Status](https://jenkins.seb6596.ovh/buildStatus/icon?job=Br
> ``` > ```
> Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/) > Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/)
### [Javadoc](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/javadoc/) ## Javadoc & Jenkins
- [Javadoc](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/javadoc/)
- [Jenkins](https://jenkins.seb6596.ovh/)
### [Jenkins](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/)
#### Jenkisfile
`git config --global merge.ours.driver true`
```
[merge "ours"]
name = "Keep ours merge"
driver = true
```