From 9df24b835762fb32106d4ad787f9fee2126aa42c Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Fri, 31 Jan 2020 21:21:22 +0100
Subject: [PATCH] Jenkins test

---
 Jenkinsfile        | 17 +----------------
 docker-compose.yml |  3 ---
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3a5f112..47140e6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,26 +11,11 @@ pipeline {
                 setEnv()
             }
         }
-        stage('Build') {
-            when {
-                branch 'master'
-            }
-            environment {
-                CREDS = credentials('docker-registry')
-            }
-            steps {
-                sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY'
-                sh 'docker-compose build --parallel'
-                sh 'docker-compose push'
-            }
-        }
         stage('Deploy') {
             when {
                 branch 'master'
             }
-            steps {
-                sh 'docker stack deploy --with-registry-auth --prune --compose-file docker-compose.yml $PROJECT_NAME'
-            }
+            dockerDeploy()
         }
     }
     post {
diff --git a/docker-compose.yml b/docker-compose.yml
index 85329ed..8a835c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,8 +2,5 @@ version: '3.7'
 services:
   main:
     image: registry.verdnatura.es/vn-autoconfig
-    build:
-      context: .
-      dockerfile: Dockerfile
     ports:
       - 80