diff --git a/.github/workflows/manual-delete-docker.yml b/.github/workflows/manual-delete-docker.yml index 2b031e3ca..dde1583d8 100644 --- a/.github/workflows/manual-delete-docker.yml +++ b/.github/workflows/manual-delete-docker.yml @@ -2,7 +2,11 @@ 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: @@ -10,4 +14,4 @@ jobs: uses: opencb/cellbase/.github/workflows/reusable-delete-docker.yml@develop with: task: ${{ inputs.task }} - secrets: inherit + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index 89c541098..58924c5e5 100644 --- 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 \ No newline at end of file