Merge branch 'master' into devel

This commit is contained in:
BrokenFire 2018-02-18 12:21:27 +01:00
commit 6e47f2f63d
4 changed files with 31 additions and 2 deletions

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
Jenkinsfile merge=ours

27
Jenkinsfile vendored Normal file
View File

@ -0,0 +1,27 @@
node {
def app
stage('Clone') { // for display purposes
// Get some code from a GitHub repository
git 'https://github.com/BrokenFire/BrokenDiscordBot.git'
}
stage('Build image') {
/* This builds the actual image; synonymous to
* docker build on the command line */
app = docker.build("brokenfire/testjenkins","--rm=true .")
}
stage('Push image') {
/* Finally, we'll push the image with two tags:
* First, the incremental build number from Jenkins
* Second, the 'latest' tag.
* Pushing multiple tags is cheap, as all the layers are reused. */
// app.push("${env.BUILD_NUMBER}")
// app.push("latest")
app.push()
app.push("${env.BUILD_NUMBER}")
}
stage('Cleaning'){
sh "docker image prune -f"
}
}

View File

@ -1,5 +1,5 @@
# BrokenDiscordBot # BrokenDiscordBot
[![](https://dockerbuildbadges.quelltext.eu/status.svg?organization=brokenfire&repository=brokendiscordbot)](https://hub.docker.com/r/brokenfire/brokendiscordbot/)
## Install: ## Install:
> The easiest method it's to use docker-compose: > The easiest method it's to use docker-compose:
@ -65,4 +65,4 @@
> internal: > internal:
> external: false > external: false
> ``` > ```
> Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/) > Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/)

1
_config.yml Normal file
View File

@ -0,0 +1 @@
theme: jekyll-theme-slate