From 2e91fde9908de2e8a9e0055f90dd70313eef9a53 Mon Sep 17 00:00:00 2001 From: docktermj Date: Wed, 27 Sep 2023 16:17:45 -0400 Subject: [PATCH] #49 Update to Senzing 3.7.0 --- ...-dependabot-request-to-project-t-comm.yaml | 17 ++++++---- .../add-issue-to-project-t-comm.yaml | 15 +++++---- .github/workflows/add-triage-label.yaml | 4 ++- .github/workflows/build-docker-container.yaml | 21 ------------ .../dependabot-approve-and-merge.yaml | 15 +++++++++ .github/workflows/docker-build-container.yaml | 24 ++++++++++++++ .../docker-push-containers-to-dockerhub.yaml | 32 +++++++++++++++++++ .github/workflows/identify-customer.yaml | 5 ++- .github/workflows/move-pr-to-done.yaml | 12 +++++++ .github/workflows/senzing-cicd-buildtest.yaml | 2 ++ .github/workflows/senzing-cicd-deploy.yaml | 2 ++ .gitignore | 1 + CHANGELOG.md | 32 +++++++++---------- Dockerfile | 10 +++--- 14 files changed, 134 insertions(+), 58 deletions(-) delete mode 100644 .github/workflows/build-docker-container.yaml create mode 100644 .github/workflows/dependabot-approve-and-merge.yaml create mode 100644 .github/workflows/docker-build-container.yaml create mode 100644 .github/workflows/docker-push-containers-to-dockerhub.yaml create mode 100644 .github/workflows/move-pr-to-done.yaml diff --git a/.github/workflows/add-dependabot-request-to-project-t-comm.yaml b/.github/workflows/add-dependabot-request-to-project-t-comm.yaml index 4d24ae7..5d9cbcb 100644 --- a/.github/workflows/add-dependabot-request-to-project-t-comm.yaml +++ b/.github/workflows/add-dependabot-request-to-project-t-comm.yaml @@ -2,23 +2,26 @@ # - https://github.com/srggrs/assign-one-project-github-action name: add-dependabot-request-to-project-t-comm.yaml + on: pull_request: types: - opened - reopened + env: GITHUB_TOKEN: ${{ secrets.SENZING_GITHUB_ACCESS_TOKEN }} CREATOR: ${{ github.event.pull_request.user.login }} + jobs: - assign_one_project: + add-dependabot-request-to-project: name: Add dependabot pull request to Senzing Community project runs-on: ubuntu-latest steps: - - name: Assign pull request to project - env: + - name: Assign pull request to project + env: BOOL: ${{ contains( env.CREATOR, 'dependabot' ) }} - uses: Senzing/github-action-add-issue-to-project@main - if: ${{ env.BOOL == 'true' }} - with: - project: 'https://github.com/orgs/Senzing/projects/2' + uses: Senzing/github-action-add-issue-to-project@main + if: ${{ env.BOOL == 'true' }} + with: + project: "https://github.com/orgs/Senzing/projects/2" diff --git a/.github/workflows/add-issue-to-project-t-comm.yaml b/.github/workflows/add-issue-to-project-t-comm.yaml index f2d32d7..978d2b1 100644 --- a/.github/workflows/add-issue-to-project-t-comm.yaml +++ b/.github/workflows/add-issue-to-project-t-comm.yaml @@ -2,20 +2,23 @@ # - https://github.com/srggrs/assign-one-project-github-action name: add-issue-to-project-t-comm.yaml + on: issues: types: - reopened - opened + env: GITHUB_TOKEN: ${{ secrets.SENZING_GITHUB_ACCESS_TOKEN }} + jobs: - assign_one_project: + add-issue-to-project: name: Add issue to Senzing Community project runs-on: ubuntu-latest steps: - - name: Assign issue to project - uses: Senzing/github-action-add-issue-to-project@main - with: - project: 'https://github.com/orgs/Senzing/projects/2' - column_name: 'Backlog' + - name: Assign issue to project + uses: Senzing/github-action-add-issue-to-project@main + with: + project: "https://github.com/orgs/Senzing/projects/2" + column_name: "Backlog" diff --git a/.github/workflows/add-triage-label.yaml b/.github/workflows/add-triage-label.yaml index 3153dde..bdbefae 100644 --- a/.github/workflows/add-triage-label.yaml +++ b/.github/workflows/add-triage-label.yaml @@ -3,13 +3,15 @@ # - https://github.com/andymckay/labeler name: add-triage-label.yaml + on: issues: types: - reopened - opened + jobs: - automate-issues-labels: + add-triage-label: name: Add triage label to issue runs-on: ubuntu-latest steps: diff --git a/.github/workflows/build-docker-container.yaml b/.github/workflows/build-docker-container.yaml deleted file mode 100644 index d5f7de4..0000000 --- a/.github/workflows/build-docker-container.yaml +++ /dev/null @@ -1,21 +0,0 @@ -name: build-docker-container.yaml -on: - pull_request: - branches: - - main - workflow_dispatch: -jobs: - buildDockerContainer: - name: Build Docker container - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - fetch-depth: '0' - - name: Print environment variables - run: printenv - - name: Git Merge With Main - run: git merge origin/main - - name: Build Docker container - run: make docker-build diff --git a/.github/workflows/dependabot-approve-and-merge.yaml b/.github/workflows/dependabot-approve-and-merge.yaml new file mode 100644 index 0000000..114db76 --- /dev/null +++ b/.github/workflows/dependabot-approve-and-merge.yaml @@ -0,0 +1,15 @@ +--- +name: dependabot-approve-and-merge.yaml + +on: + pull_request: + branches: [main] + +jobs: + dependabot-approve-and-merge: + permissions: + contents: write + pull-requests: write + uses: Senzing/build-resources/.github/workflows/dependabot-approve-and-merge.yaml@main + secrets: + SENZING_GITHUB_CODEOWNER_PR_RW_TOKEN: ${{ secrets.SENZING_GITHUB_CODEOWNER_PR_RW_TOKEN }} diff --git a/.github/workflows/docker-build-container.yaml b/.github/workflows/docker-build-container.yaml new file mode 100644 index 0000000..81876cf --- /dev/null +++ b/.github/workflows/docker-build-container.yaml @@ -0,0 +1,24 @@ +name: docker-build-container.yaml + +on: + pull_request: + branches: + - main + workflow_dispatch: + +jobs: + docker-build-container: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: "0" + - name: git config + run: | + git config user.name github-actions + git config user.email support@senzing.com + - name: Git Update submodules + run: git submodule update --init --recursive + - name: Build Docker container + run: make docker-build diff --git a/.github/workflows/docker-push-containers-to-dockerhub.yaml b/.github/workflows/docker-push-containers-to-dockerhub.yaml new file mode 100644 index 0000000..b9af80c --- /dev/null +++ b/.github/workflows/docker-push-containers-to-dockerhub.yaml @@ -0,0 +1,32 @@ +name: docker-push-containers-to-dockerhub.yaml + +on: + push: + tags: + - "[0-9]+.[0-9]+.[0-9]+" + +jobs: + docker-push-containers-to-dockerhub: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: "0" + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Docker list platforms + run: docker buildx ls + - name: Dockerhub login + run: echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin + - name: Docker build images + run: | + docker buildx build \ + --no-cache \ + --platform linux/amd64 \ + --push \ + --tag senzing/senzingapi-runtime:${{ github.ref_name }} \ + --tag senzing/sengingapi-runtime:latest \ + . diff --git a/.github/workflows/identify-customer.yaml b/.github/workflows/identify-customer.yaml index d8dcac2..2e9a0da 100644 --- a/.github/workflows/identify-customer.yaml +++ b/.github/workflows/identify-customer.yaml @@ -1,14 +1,17 @@ name: identify-customer.yaml + on: issues: types: - opened + env: GITHUB_TOKEN: ${{ secrets.ORG_MEMBERSHIP_TOKEN }} MEMBER_LIST: ${{ secrets.SENZING_MEMBERS }} CREATOR: ${{ github.actor }} + jobs: - automate-issues-labels: + identify-customer: name: Add customer-submission label runs-on: ubuntu-latest steps: diff --git a/.github/workflows/move-pr-to-done.yaml b/.github/workflows/move-pr-to-done.yaml new file mode 100644 index 0000000..a77c683 --- /dev/null +++ b/.github/workflows/move-pr-to-done.yaml @@ -0,0 +1,12 @@ +--- +name: move-pr-to-done.yaml + +on: + pull_request: + types: [closed] + +jobs: + move-pr-to-done: + uses: Senzing/build-resources/.github/workflows/move-pr-to-done.yaml@main + secrets: + SENZING_GITHUB_PROJECT_RW_TOKEN: ${{ secrets.SENZING_GITHUB_PROJECT_RW_TOKEN }} diff --git a/.github/workflows/senzing-cicd-buildtest.yaml b/.github/workflows/senzing-cicd-buildtest.yaml index 23f809e..8e29f76 100644 --- a/.github/workflows/senzing-cicd-buildtest.yaml +++ b/.github/workflows/senzing-cicd-buildtest.yaml @@ -1,8 +1,10 @@ name: senzing-cicd-buildtest.yaml + on: pull_request: branches: - main + jobs: senzing-cicd-buildtest: name: Build and test code via codebuild diff --git a/.github/workflows/senzing-cicd-deploy.yaml b/.github/workflows/senzing-cicd-deploy.yaml index d5ccfe6..7adea19 100644 --- a/.github/workflows/senzing-cicd-deploy.yaml +++ b/.github/workflows/senzing-cicd-deploy.yaml @@ -1,8 +1,10 @@ name: senzing-cicd-deploy.yaml + on: push: branches: - main + jobs: senzing-cicd-deploy: name: Deploy to ECR via codebuild diff --git a/.gitignore b/.gitignore index e43b0f9..1e555eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .DS_Store +.history diff --git a/CHANGELOG.md b/CHANGELOG.md index a8757cb..b4682fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,89 +6,87 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), [markdownlint](https://dlaa.me/markdownlint/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - -## [3.7.0] - 2023-09-25 +## [3.7.0] - 2023-09-27 ### Changed in 3.7.0 - - Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.7.0` +- Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.7.0` ## [3.6.0] - 2023-06-29 ### Changed in 3.6.0 - - Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.6.0` +- Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.6.0` ## [3.5.3] - 2023-06-15 ### Changed in 3.5.3 - - Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.5.3` +- Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.5.3` ## [3.5.2] - 2023-05-09 ### Changed in 3.5.2 - - Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.5.2` +- Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.5.2` ## [3.5.0] - 2023-04-03 ### Changed in 3.5.0 - - Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.5.0` +- Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.5.0` ## [3.4.2] - 2023-02-10 ### Changed in 3.4.2 - - Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.4.2` +- Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.4.2` ## [3.4.1] - 2023-01-30 ### Changed in 3.4.1 - - Updated Dockerfile to a two stage build so that we can pull in a newer version of `prettytable` - - Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.4.1` +- Updated Dockerfile to a two stage build so that we can pull in a newer version of `prettytable` +- Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.4.1` ## [3.4.0] - 2023-01-12 ### Changed in 3.4.0 - - Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.4.0` +- Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.4.0` ## [3.3.2] - 2022-10-27 ### Changed in 3.3.2 - - Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.3.2` +- Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.3.2` ## [3.3.1] - 2022-10-11 ### Changed in 3.3.1 - - Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.3.1` +- Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.3.1` ## [3.3.0] - 2022-09-27 ### Changed in 3.3.0 - - Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.3.0` +- Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.3.0` ## [3.2.0] - 2022-08-25 ### Changed in 3.2.0 - - Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.2.0` +- Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.2.0` ## [3.1.1] - 2022-08-15 ### Changed in 3.1.1 - - Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.1.2` +- Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.1.2` ## [3.1.0] - 2022-07-19 ### Changed in 3.1.0 - Initial version - diff --git a/Dockerfile b/Dockerfile index 8299e48..4b51ec3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=senzing/senzingapi-runtime:3.7.0 # Create the runtime image. ARG SENZING_ACCEPT_EULA="I_ACCEPT_THE_SENZING_EULA" -ARG SENZING_APT_INSTALL_TOOLS_PACKAGE="senzingapi-tools=3.6.0-23160" +ARG SENZING_APT_INSTALL_TOOLS_PACKAGE="senzingapi-tools=3.7.0-23248" # ----------------------------------------------------------------------------- # Stage: builder @@ -11,11 +11,11 @@ ARG SENZING_APT_INSTALL_TOOLS_PACKAGE="senzingapi-tools=3.6.0-23160" FROM ${BASE_IMAGE} AS builder -ENV REFRESHED_AT=2023-09-25 +ENV REFRESHED_AT=2023-09-27 LABEL Name="senzing/senzingapi-tools" \ Maintainer="support@senzing.com" \ - Version="3.6.0" + Version="3.7.0" # Run as "root" for system installation. @@ -52,7 +52,7 @@ RUN pip3 install --upgrade pip \ FROM ${BASE_IMAGE} AS runner -ENV REFRESHED_AT=2023-09-25 +ENV REFRESHED_AT=2023-09-27 ARG SENZING_ACCEPT_EULA ARG SENZING_APT_INSTALL_TOOLS_PACKAGE @@ -62,7 +62,7 @@ ENV SENZING_ACCEPT_EULA=${SENZING_ACCEPT_EULA} \ LABEL Name="senzing/senzingapi-tools" \ Maintainer="support@senzing.com" \ - Version="3.6.0" + Version="3.7.0" # Run as "root" for system installation.