Fix merge delete docker and manual delete docker #TASK-7417

opencb · Feb 19, 2025 · 7ba4131 · 7ba4131
1 parent ad2b9d4
commit 7ba4131
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 20 deletions.
diff --git a/.github/workflows/manual-delete-docker.yml b/.github/workflows/manual-delete-docker.yml
@@ -2,12 +2,16 @@ name: Manual Delete Docker Image
 
 on:
   workflow_dispatch:
-
+    inputs:
+      task:
+        description: "Tag of the Docker image to delete (must start with 'TASK')"
+        required: true
+        type: string
 
 jobs:
   call-delete-docker:
     name: Call Reusable Delete Docker Workflow
     uses: opencb/cellbase/.github/workflows/reusable-delete-docker.yml@develop
     with:
       task: ${{ inputs.task }}
-    secrets: inherit
+    secrets: inherit
diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml
@@ -9,21 +9,9 @@ on:
       - closed
 
 jobs:
-  delete-docker:
-    name: Execute delete docker image
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: '10'
-      - uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_HUB_USER }}
-          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-      - name: Delete in Docker Hub
-        run: |
-          echo "Deleting docker image ${{ github.head_ref }}"
-          python3 ./cellbase-app/app/cloud/docker/docker-build.py delete --images base --tag ${{ github.head_ref }}
-
-
-
+  call-delete-docker:
+    name: Call Reusable Delete Docker Workflow
+    uses: opencb/cellbase/.github/workflows/reusable-delete-docker.yml@develop
+    with:
+      task: ${{ github.head_ref }}
+    secrets: inherit