6695-docker_push_3 #1423

Merged
alexm merged 424 commits from 6695-docker_push_3 into dev 2025-02-21 12:41:37 +00:00
1 changed files with 9 additions and 2 deletions
Showing only changes of commit 8bfe7211b0 - Show all commits

11
Jenkinsfile vendored
View File

@ -170,8 +170,15 @@ pipeline {
def cleanDockerE2E() {
script {
sh(script: "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down", returnStatus: true)
sh(script: "docker rm ${containerId}", returnStatus: true)
def composeDown = sh(script: "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down", returnStatus: true)
if (composeDown != 0) {
echo "docker-compose down failed, but continuing..."
}
def removeContainer = sh(script: "docker rm ${containerId}", returnStatus: true)
if (removeContainer != 0) {
echo "Failed to remove container ${containerId}, it probably did not exist."
}
}
}