Merge pull request #1805 from SameeraPriyathamTadikonda/develop

rjrudin · web-flow · commit fff16f839440 · 2025-07-23T17:59:48.000-04:00
PDP-598: Cleaning up docker containers,images and volumes
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -13,6 +13,7 @@ def getJava(){
 }
 
 def setupDockerMarkLogic(String image){
+	cleanupDocker()
 	sh label:'mlsetup', script: '''#!/bin/bash
 	echo "Removing any running MarkLogic server and clean up MarkLogic data directory"
     sudo /usr/local/sbin/mladmin remove
@@ -136,6 +137,7 @@ def tearDownDocker() {
 		docker compose down -v || true
 		docker volume prune -f
 	'''
+	cleanupDocker()
 }
 
 pipeline{

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ def getJava(){`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`def setupDockerMarkLogic(String image){`
	`16`	`+ cleanupDocker()`
`16`	`17`	`sh label:'mlsetup', script: '''#!/bin/bash`
`17`	`18`	`echo "Removing any running MarkLogic server and clean up MarkLogic data directory"`
`18`	`19`	`sudo /usr/local/sbin/mladmin remove`
`@@ -136,6 +137,7 @@ def tearDownDocker() {`
`136`	`137`	`docker compose down -v \|\| true`
`137`	`138`	`docker volume prune -f`
`138`	`139`	`'''`
	`140`	`+ cleanupDocker()`
`139`	`141`	`}`
`140`	`142`
`141`	`143`	`pipeline{`