Skip to content

Commit

Permalink
#49 Update to Senzing 3.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
docktermj committed Sep 27, 2023
1 parent be3bcbf commit 2e91fde
Show file tree
Hide file tree
Showing 14 changed files with 134 additions and 58 deletions.
17 changes: 10 additions & 7 deletions .github/workflows/add-dependabot-request-to-project-t-comm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
15 changes: 9 additions & 6 deletions .github/workflows/add-issue-to-project-t-comm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 3 additions & 1 deletion .github/workflows/add-triage-label.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
21 changes: 0 additions & 21 deletions .github/workflows/build-docker-container.yaml

This file was deleted.

15 changes: 15 additions & 0 deletions .github/workflows/dependabot-approve-and-merge.yaml
Original file line number Diff line number Diff line change
@@ -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 }}
24 changes: 24 additions & 0 deletions .github/workflows/docker-build-container.yaml
Original file line number Diff line number Diff line change
@@ -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 [email protected]
- name: Git Update submodules
run: git submodule update --init --recursive
- name: Build Docker container
run: make docker-build
32 changes: 32 additions & 0 deletions .github/workflows/docker-push-containers-to-dockerhub.yaml
Original file line number Diff line number Diff line change
@@ -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 \
.
5 changes: 4 additions & 1 deletion .github/workflows/identify-customer.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/move-pr-to-done.yaml
Original file line number Diff line number Diff line change
@@ -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 }}
2 changes: 2 additions & 0 deletions .github/workflows/senzing-cicd-buildtest.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/senzing-cicd-deploy.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
name: senzing-cicd-deploy.yaml

on:
push:
branches:
- main

jobs:
senzing-cicd-deploy:
name: Deploy to ECR via codebuild
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.DS_Store
.history
32 changes: 15 additions & 17 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ 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
# -----------------------------------------------------------------------------

FROM ${BASE_IMAGE} AS builder

ENV REFRESHED_AT=2023-09-25
ENV REFRESHED_AT=2023-09-27

LABEL Name="senzing/senzingapi-tools" \
Maintainer="[email protected]" \
Version="3.6.0"
Version="3.7.0"

# Run as "root" for system installation.

Expand Down Expand Up @@ -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
Expand All @@ -62,7 +62,7 @@ ENV SENZING_ACCEPT_EULA=${SENZING_ACCEPT_EULA} \

LABEL Name="senzing/senzingapi-tools" \
Maintainer="[email protected]" \
Version="3.6.0"
Version="3.7.0"

# Run as "root" for system installation.

Expand Down

0 comments on commit 2e91fde

Please sign in to comment.