From 0be21f7475683244fdc4f8b221f9ee1979b3dbfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Cl=C3=A9ment?= Date: Fri, 16 Feb 2018 15:51:11 +0100 Subject: [PATCH 1/6] Set theme jekyll-theme-slate --- _config.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 _config.yml diff --git a/_config.yml b/_config.yml new file mode 100644 index 0000000..c741881 --- /dev/null +++ b/_config.yml @@ -0,0 +1 @@ +theme: jekyll-theme-slate \ No newline at end of file From 1e6d8f72c80412be55deafd7762dcea8083f6459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Cl=C3=A9ment?= Date: Fri, 16 Feb 2018 16:18:27 +0100 Subject: [PATCH 2/6] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index aa08c6f..fbee759 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # BrokenDiscordBot - +[![](https://dockerbuildbadges.quelltext.eu/status.svg?organization=brokenfire&repository=brokendiscordbot)](https://hub.docker.com/r/brokenfire/brokendiscordbot/) ## Install: > The easiest method it's to use docker-compose: @@ -65,4 +65,4 @@ > internal: > external: false > ``` -> Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/) \ No newline at end of file +> Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/) From b0d8fa02b1a86d0169eff899e20cc5f176ffed3c Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 17 Feb 2018 18:02:58 +0100 Subject: [PATCH 3/6] jenkins test --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fbee759..91163fb 100644 --- a/README.md +++ b/README.md @@ -65,4 +65,5 @@ > internal: > external: false > ``` -> Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/) +> Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/) + From 36784871cbbe9aebdbc052f40f01a7c1933a39cd Mon Sep 17 00:00:00 2001 From: BrokenFire Date: Sun, 18 Feb 2018 02:00:40 +0100 Subject: [PATCH 4/6] Jenkins test --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 91163fb..a9e7e12 100644 --- a/README.md +++ b/README.md @@ -66,4 +66,3 @@ > external: false > ``` > Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/) - From 506e45dfda1101c149220578a4bf6d1650bead83 Mon Sep 17 00:00:00 2001 From: BrokenFire Date: Sun, 18 Feb 2018 12:13:50 +0100 Subject: [PATCH 5/6] Adding Jenkinsfile --- Jenkinsfile | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..90cd4f8 --- /dev/null +++ b/Jenkinsfile @@ -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" + } +} From 3c4f815ab841fcbfeaa3cee56923ec20e089af7a Mon Sep 17 00:00:00 2001 From: BrokenFire Date: Sun, 18 Feb 2018 12:21:12 +0100 Subject: [PATCH 6/6] Adding gitattributes --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..6d99763 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +Jenkinsfile merge=ours