From a8d5f06866dd11466eca3f1332c51af1ea9e0c46 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Mon, 25 Nov 2024 16:59:26 +0100
Subject: [PATCH] refs #4922 Deploy fixes

---
 Jenkinsfile        |  5 -----
 debian/rules       |  3 +++
 docker-compose.yml | 34 +---------------------------------
 3 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e774d49d..1e67238d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -62,11 +62,6 @@ pipeline {
                     }
                 }
             }
-            post {
-                always {
-                    sh 'rm -r debuild'
-                }
-            }
         }
         stage('Deploy') {
             when {
diff --git a/debian/rules b/debian/rules
index fecfb958..4076b335 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@ clean:
 	npm run clean
 	dh_clean $@
 
+override_dh_clean:
+	dh_clean
+
 build:
 	npm install --no-audit --prefer-offline
 	npx quasar build
diff --git a/docker-compose.yml b/docker-compose.yml
index 3d82bab1..ff930121 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,41 +1,9 @@
 version: '3.7'
 services:
   main:
-    image: registry.verdnatura.es/hedera-web:${BRANCH_NAME:?}
+    image: registry.verdnatura.es/verdnatura/hedera-web:${TAG:?}
     build:
       context: .
       dockerfile: Dockerfile
       args:
         - VERSION=${VERSION:?}
-    ports:
-      - 80
-    configs:
-      - source: config
-        target: /etc/hedera-web/config.my.php
-    volumes:
-      - /mnt/appdata:/mnt/storage
-      - /mnt/appdata/image:/var/lib/hedera-web/image-db
-      - /mnt/appdata/vn-access:/var/lib/hedera-web/vn-access
-    deploy:
-      replicas: ${MAIN_REPLICAS:?}
-      placement:
-        constraints:
-          - node.role == worker
-  cron:
-    image: registry.verdnatura.es/hedera-web:${BRANCH_NAME:?}
-    command: 'cron -f'
-    configs:
-      - source: config
-        target: /etc/hedera-web/config.my.php
-    volumes:
-      - /mnt/appdata:/mnt/storage
-      - /mnt/appdata/image:/var/lib/hedera-web/image-db
-    deploy:
-      replicas: ${CRON_REPLICAS:?}
-      placement:
-        constraints:
-          - node.role == worker
-configs:
-  config:
-    external: true
-    name: ${PROJECT_NAME:?}-${BRANCH_NAME:?}