From bde1698bdcd34d6e1fe277818b921449db953852 Mon Sep 17 00:00:00 2001
From: Sergey Konovalov <Sergey.Konovalov@onlyoffice.com>
Date: Mon, 11 Aug 2025 12:45:47 +0300
Subject: [PATCH] [git actions] Clean up Docker before and after action
 completes

---
 .github/workflows/azureStorageTests.yml | 16 ++++++++++++++--
 .github/workflows/s3storageTests.yml    | 21 +++++++++++++++++----
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/azureStorageTests.yml b/.github/workflows/azureStorageTests.yml
index ae54a493..2e2e6be1 100644
--- a/.github/workflows/azureStorageTests.yml
+++ b/.github/workflows/azureStorageTests.yml
@@ -13,14 +13,22 @@ jobs:
   azure-storage-tests:
     name: Azure Storage Tests
     runs-on: ubuntu-latest
+    env:
+      AZURITE_CONTAINER: azurite-${{ github.run_id }}-${{ github.run_attempt }}
 
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3
 
+      - name: Pre-run cleanup
+        run: |
+          docker rm -f "$AZURITE_CONTAINER" 2>/dev/null || true
+          # Remove legacy container name if it exists (for self-hosted runners or retries)
+          docker rm -f azurite 2>/dev/null || true
+
       - name: Run Azurite docker container
         run: |
-          docker run --name azurite \
+          docker run --name "$AZURITE_CONTAINER" \
             -p 10000:10000 \
             -p 10001:10001 \
             -p 10002:10002 \
@@ -120,4 +128,8 @@ jobs:
           "
 
       - name: Run storage tests
-        run: npm run storage-tests
\ No newline at end of file
+        run: npm run storage-tests
+
+      - name: Final cleanup
+        if: always()
+        run: docker rm -f "$AZURITE_CONTAINER" || true
\ No newline at end of file
diff --git a/.github/workflows/s3storageTests.yml b/.github/workflows/s3storageTests.yml
index 15b0c558..51a2da27 100644
--- a/.github/workflows/s3storageTests.yml
+++ b/.github/workflows/s3storageTests.yml
@@ -7,16 +7,25 @@ on:
       - 'tests/integration/withServerInstance/storage.tests.js'
       - 'Common/sources/storage/**'
       - 'DocService/sources/routes/static.js'
+      - '.github/workflows/s3storageTests.yml'
 
 jobs:
   storage-tests:
     name: Storage Tests
     runs-on: ubuntu-latest
+    env:
+      MINIO_CONTAINER: minio-${{ github.run_id }}-${{ github.run_attempt }}
 
     steps:
+      - name: Pre-run cleanup
+        run: |
+          docker rm -f "$MINIO_CONTAINER" 2>/dev/null || true
+          # Remove legacy container name if it exists (for self-hosted runners or retries)
+          docker rm -f minio 2>/dev/null || true
+
       - name: Run MinIO docker container
         run: |
-          docker run --name minio \
+          docker run --name "$MINIO_CONTAINER" \
             -p 9000:9000 \
             -p 9001:9001 \
             -e "MINIO_ROOT_USER=minioadmin" \
@@ -70,8 +79,12 @@ jobs:
 
       - name: Create MinIO buckets
         run: |
-          docker exec minio mc alias set myminio http://localhost:9000 minioadmin minioadmin
-          docker exec minio mc mb myminio/cache
+          docker exec "$MINIO_CONTAINER" mc alias set myminio http://localhost:9000 minioadmin minioadmin
+          docker exec "$MINIO_CONTAINER" mc mb myminio/cache
 
       - name: Run storage tests
-        run: npm run storage-tests
\ No newline at end of file
+        run: npm run storage-tests
+
+      - name: Final cleanup
+        if: always()
+        run: docker rm -f "$MINIO_CONTAINER" || true
\ No newline at end of file