organize files and gha workflow

.github/workflows/docker-ora2pg.yaml

@@ -2,12 +2,12 @@ name: Push to GHCR
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
 
 env:
   REGISTRY: ghcr.io
-  # github.repository as <account>/<repo> # should be renamed to end in -ora2pg
-  IMAGE_NAME: ${{ github.repository }}
+  DOCKERFILE_PATH: shared/ora2pg
+  IMAGE_NAME: ${{ github.repository }}-ora2pg
 
 jobs:
   build:
@@ -46,7 +46,8 @@ jobs:
         id: build-and-push
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
-          context: .
+          # DF-NOTE: to help the action find the Dockerfile to build from
+          context: ${{ env.DOCKERFILE_PATH }}/
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/docker-trino.yaml → .github/workflows/docker-ora2s3.yaml

@@ -5,10 +5,9 @@ on:
     branches: [ "main" ]
 
 env:
-  # DF-NOTE: pull ghcr.io/bcgov/nr-dap-ods-trino:main
   REGISTRY: ghcr.io
-  DOCKERFILE_PATH: shared/trino
-  IMAGE_NAME: ${{ github.repository }}-trino
+  DOCKERFILE_PATH: shared/ora2s3
+  IMAGE_NAME: ${{ github.repository }}-ora2s3
 
 jobs:
   build:
@@ -61,5 +60,5 @@ jobs:
           # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
           TAGS: ${{ steps.meta.outputs.tags }}
           DIGEST: ${{ steps.build-and-push.outputs.digest }}
-          
+
         run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}

.github/workflows/docker-pg2pg.yaml

@@ -5,9 +5,8 @@ on:
     branches: ["main"]
 
 env:
-  # DF-NOTE: pull ghcr.io/bcgov/nr-dap-ods-trino:main
   REGISTRY: ghcr.io
-  DOCKERFILE_PATH: shared/ods_replication_pg2pg
+  DOCKERFILE_PATH: shared/pg2pg
   IMAGE_NAME: ${{ github.repository }}-pg2pg
 
 jobs:
@@ -61,5 +60,5 @@ jobs:
           # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
           TAGS: ${{ steps.meta.outputs.tags }}
           DIGEST: ${{ steps.build-and-push.outputs.digest }}
-          
+
         run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}