Merge pull request #27 from BrokenFire/devel

Devel
This commit is contained in:
Sébastien Clément 2018-03-01 20:03:10 +01:00 committed by GitHub
commit ad5dc72f76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

17
Jenkinsfile vendored
View File

@ -32,16 +32,19 @@ node {
* First, the incremental build number from Jenkins * First, the incremental build number from Jenkins
* Second, the 'latest' tag. * Second, the 'latest' tag.
* Pushing multiple tags is cheap, as all the layers are reused. */ * Pushing multiple tags is cheap, as all the layers are reused. */
def docker_tag withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'docker-hub-credentials', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
script { sh 'docker login -u $USERNAME -p $PASSWORD'
if (env.BRANCH_NAME == 'master') { script {
app.push() if (env.BRANCH_NAME == 'master') {
} else { app.push()
app.push("devel") } else {
} app.push("devel")
}
}
} }
} }
stage('Cleaning'){ stage('Cleaning'){
sh "docker image prune -f" sh "docker image prune -f"