From 6157fd64220cc5c82d9e525e671a4f4d27b69d74 Mon Sep 17 00:00:00 2001
From: Julien Cabillot <julien.cabillot@fxinnovation.com>
Date: Sat, 13 Jul 2019 17:42:53 -0400
Subject: [PATCH] use new jenkinsfile

---
 Jenkinsfile | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7355c38..a75b17e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,25 +1,35 @@
 pipeline {
   environment {
-    registry = 'jcabillot/htpasswd'
+    registry = 'https://registry.hub.docker.com'
     registryCredential = 'dockerhub_jcabillot'
-    dockerImage = ''
+    dockerImage = 'jcabillot/htpasswd'
   }
 
   agent any
 
+  triggers {
+    cron('@midnight')
+  }
+
   stages {
-    stage('Building image') {
+    stage('Clone repository') {
       steps{
-        script {
-          dockerImage = docker.build registry + ":latest"
-        }
+        checkout scm
       }
     }
+
+    stage('Build image') {
+      steps{
+        sh "docker build -t jcabillot/jenkins-wdocker ."
+      }
+    }
+
     stage('Deploy Image') {
       steps{
         script {
-          docker.withRegistry('', registryCredential) {
-            dockerImage.push()
+          withCredentials([usernamePassword(credentialsId: 'dockerhub_jcabillot', usernameVariable: 'DOCKER_USER', passwordVariable: 'DOCKER_PASS')]) {
+            sh 'docker login --username ${DOCKER_USER} --password ${DOCKER_PASS}'
+            sh 'docker push ${dockerImage}'
           }
         }
       }