Merge branch 'devel'
This commit is contained in:
commit
31ce55e626
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@ -21,13 +21,13 @@ node {
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('Build image') {
|
||||
stage('Build Docker image') {
|
||||
/* This builds the actual image; synonymous to
|
||||
* 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 .')
|
||||
}
|
||||
stage('Push image') {
|
||||
stage('Push Docker image') {
|
||||
/* Finally, we'll push the image with two tags:
|
||||
* First, the incremental build number from Jenkins
|
||||
* Second, the 'latest' tag.
|
||||
|
20
README.md
20
README.md
@ -1,8 +1,10 @@
|
||||
# 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:
|
||||
|
||||
> 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/)
|
||||
|
||||
### [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
|
||||
```
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user