From f480bbba84faf5ca12e9996c63309745c8113dbc Mon Sep 17 00:00:00 2001
From: C24053098 <akbarb@cardiff.ac.uk>
Date: Mon, 7 Apr 2025 03:03:51 +0100
Subject: [PATCH] Add resource limits and update Jenkinsfile
---
Jenkinsfile | 7 +++----
docker-compose.yml | 10 ++++++++++
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index afa5c85..26af160 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,11 +1,10 @@
pipeline {
- agent {
- label 'my-agent-label'
- }
-
+ agent any // Changed from "label 'my-agent-label'"
+
stages {
stage('Build') {
steps {
+ sh 'chmod +x gradlew' // to make gradlew executable
sh './gradlew clean build'
}
}
diff --git a/docker-compose.yml b/docker-compose.yml
index ee6537e..daa45ae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,11 @@ services:
MYSQL_ROOT_PASSWORD: comsc
volumes:
- "./src/main/resources:/docker-entrypoint-initdb.d"
+ deploy:
+ resources:
+ limits:
+ cpus: '0.5'
+ memory: 512M
networks:
- healthcare_network
@@ -22,6 +27,11 @@ services:
- DB_URL=jdbc:mariadb://mariadb:3306/healthcare?createDatabaseIfNotExist=true
ports:
- "8080:8080"
+ deploy:
+ resources:
+ limits:
+ cpus: '1'
+ memory: 1G
networks:
- healthcare_network
depends_on:
--
GitLab