Drop defaults

bcgov · Oct 10, 2023 · e1cfa79 · e1cfa79
1 parent d01ce3f
commit e1cfa79
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -14,9 +14,6 @@ jobs:
   # https://github.com/bcgov-nr/action-builder-ghcr
   DBs:
     defaults:
-      run:
-        shell: bash
-        working-directory: ./database
     if: "!github.event.pull_request.head.repo.fork"
     permissions:
       packages: write
@@ -31,17 +28,17 @@ jobs:
       - name: Get first tag
         id: tag
         run: |
-          TAG=$(grep '^FROM' ${{ matrix.package }}/${{ matrix.tag }}/Dockerfile | cut -d':' -f2)
+          TAG=$(grep '^FROM' database/${{ matrix.package }}/${{ matrix.tag }}/Dockerfile | cut -d':' -f2)
           echo "tag=${TAG}" >> $GITHUB_OUTPUT
 
       - name: Build or import
         uses: bcgov-nr/[email protected]
         with:
-          build_context: ${{ matrix.package }}/${{ matrix.tag }}
+          build_context: database/${{ matrix.package }}/${{ matrix.tag }}
           package: ${{ matrix.package }}
           tag: ${{ steps.tag.outputs.tag }}
           token: ${{ github.token }}
-          triggers: ${{ matrix.package}}/${{ matrix.triggers }}
+          triggers: database/${{ matrix.package}}/${{ matrix.triggers }}
 
   Wrap-up:
     needs: [DBs]