From 1ea01f0def5f6c102658a931bcffbe5c12d34138 Mon Sep 17 00:00:00 2001
From: Oksana Grishchenko <oksana.grishchenko@percona.com>
Date: Thu, 30 Jul 2026 14:31:17 +0500
Subject: [PATCH 1/2] fix conflicted containers

---
 Jenkinsfile             | 1 +
 docker-compose.test.yml | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index cf43b99a..c75358c4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -64,6 +64,7 @@ pipeline {
                 }
             }
             sh '''
+                docker-compose -f docker-compose.test.yml down --volumes --remove-orphans || true
                 sudo docker rmi -f \$(sudo docker images -q) || true
                 sudo rm -rf ./*
             '''
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index e3767f89..0c016a0e 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -21,7 +21,6 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile
-    container_name: version-service
     hostname: version-service
     networks:
       - integration-tests

From 61892ec45cf0e543005348f9394f3e36ade2985f Mon Sep 17 00:00:00 2001
From: Oksana Grishchenko <oksana.grishchenko@percona.com>
Date: Thu, 30 Jul 2026 14:38:36 +0500
Subject: [PATCH 2/2] remove orphans

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index c75358c4..3e145bcf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,6 +40,7 @@ pipeline {
                    sudo curl -SL "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-$(uname -s | tr '[:upper:]' '[:lower:]')-$(uname -m)" -o /usr/local/bin/docker-compose
                    sudo chmod +x /usr/local/bin/docker-compose
 
+                   docker-compose -f docker-compose.test.yml down --volumes --remove-orphans || true
                    docker-compose -f docker-compose.test.yml up --build --abort-on-container-exit
                    '''
                 script {