Merge pull request #220 from planetf1/pkg

Updated packaging for multiple connectors

.github/dependabot.yml

@@ -9,18 +9,10 @@ updates:
   open-pull-requests-limit: 100
   reviewers:
   - planetf1
-  - wbittles
 - package-ecosystem: "github-actions"
   directory: "/"
   schedule:
     interval: monthly
   open-pull-requests-limit: 25
   reviewers:
   - planetf1
-- package-ecosystem: docker
-  directory: "/"
-  schedule:
-    interval: monthly
-  open-pull-requests-limit: 10
-  reviewers:
-  - planetf1

.github/workflows/merge.yml

@@ -13,8 +13,6 @@ jobs:
   build:
     runs-on: ubuntu-latest
     name: "Merge"
-    env:
-      RELEASE_VERSION: 3.6
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK
@@ -49,50 +47,5 @@ jobs:
       - name: Upload Connector
         uses: actions/upload-artifact@v3
         with:
-          name: Postgres Connector
+          name: Database Connectors
           path: '**/build/libs/*.jar'
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-        if: ${{ (github.event_name == 'workflow_dispatch' || github.event_name == 'push') && github.repository == 'odpi/egeria-database-connectors' }}
-      - name: Login to container registry (Quay.io)
-        uses: docker/login-action@v2
-        with:
-          registry: quay.io
-          username: ${{ secrets.QUAY_IO_USERNAME }}
-          password: ${{ secrets.QUAY_IO_ACCESS_TOKEN }}
-        if: ${{ (github.event_name == 'workflow_dispatch' || github.event_name == 'push') && github.repository == 'odpi/egeria-database-connectors' }}
-      # For releases (ie not main)
-      - name: Build and push (not main merge)
-        if: github.ref != 'refs/heads/main'
-        id: docker_build_release
-        uses: docker/build-push-action@v3
-        with:
-          push: ${{ (github.event_name == 'workflow_dispatch' || github.event_name == 'push') && github.repository == 'odpi/egeria-database-connectors' }}
-          tags: odpi/egeria-database-connectors:${{env.RELEASE_VERSION}},quay.io/odpi/egeria-database-connectors:${{env.RELEASE_VERSION}}
-          build-args: version=${{ env.RELEASE_VERSION }}
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64
-      # For main code stream
-      - name: Build and push (main merge)
-        if: github.ref == 'refs/heads/main'
-        id: docker_build_main
-        uses: docker/build-push-action@v3
-        with:
-          push: ${{ (github.event_name == 'workflow_dispatch' || github.event_name == 'push') && github.repository == 'odpi/egeria-database-connectors' }}
-          tags: odpi/egeria-database-connectors:${{ env.RELEASE_VERSION}}, odpi/egeria-database-connectors:latest, quay.io/odpi/egeria-database-connectors:${{ env.RELEASE_VERSION}}, quay.io/odpi/egeria-database-connectors:latest
-          build-args: version=${{ env.RELEASE_VERSION }}
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64
-      - name: Image digest (release)
-        if: github.ref != 'refs/heads/main'
-        run: echo ${{ steps.docker_build_release.outputs.digest }}
-      - name: Image digest (main)
-        if: github.ref == 'refs/heads/main'
-        run: echo ${{ steps.docker_build_main.outputs.digest }}

.github/workflows/release.yml

@@ -47,5 +47,5 @@ jobs:
       - name: Upload Connector
         uses: actions/upload-artifact@v3
         with:
-          name: Postgres Connector
+          name: Database Connectors
           path: '**/build/libs/*.jar'

.github/workflows/verify.yml

@@ -30,6 +30,6 @@ jobs:
       - name: Upload Connector
         uses: actions/upload-artifact@v3
         with:
-          name: Postgres Connector
+          name: Database Connectors
           path: '**/build/libs/*.jar'