From 4dcbf572975a5ddb10afa15e56bdd9e3cc42d08f Mon Sep 17 00:00:00 2001
From: C24053098 <akbarb@cardiff.ac.uk>
Date: Mon, 7 Apr 2025 19:13:49 +0100
Subject: [PATCH] including docker-compose.yml changes
---
Jenkinsfile | 20 +++++++++++++++++---
docker-compose.yml | 6 +++---
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 26af160..553eeb5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,19 +1,33 @@
pipeline {
- agent any // Changed from "label 'my-agent-label'"
+ agent any
+
+ options {
+ timeout(time: 30, unit: 'MINUTES')
+ }
stages {
stage('Build') {
steps {
- sh 'chmod +x gradlew' // to make gradlew executable
- sh './gradlew clean build'
+ sh 'chmod +x gradlew'
+ // Limit memory usage for Gradle build
+ sh './gradlew --no-daemon --max-workers=1 clean build'
}
}
stage('Deploy with Docker') {
steps {
sh 'docker-compose down || true'
+ // Clean up unused resources before deploying
+ sh 'docker system prune -f'
sh 'docker-compose up -d'
}
}
}
+
+ post {
+ always {
+ sh 'docker system prune -f || true'
+ cleanWs()
+ }
+ }
}
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index daa45ae..8d71155 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,8 +13,8 @@ services:
deploy:
resources:
limits:
- cpus: '0.5'
- memory: 512M
+ cpus: '1'
+ memory: 1024M
networks:
- healthcare_network
@@ -31,7 +31,7 @@ services:
resources:
limits:
cpus: '1'
- memory: 1G
+ memory: 1536M
networks:
- healthcare_network
depends_on:
--
GitLab