Skip to content

Commit

Permalink
Merge pull request #478 from Senzing/github-util/update-dockerfiles/2…
Browse files Browse the repository at this point in the history
…0230929

github-util: Update FROM version
  • Loading branch information
docktermj authored Sep 29, 2023
2 parents 58d19c7 + 4f31e19 commit 073daaf
Show file tree
Hide file tree
Showing 12 changed files with 84 additions and 47 deletions.
17 changes: 10 additions & 7 deletions .github/workflows/add-dependabot-request-to-project-t-ast.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-ast.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 App-Server 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/6'
uses: Senzing/github-action-add-issue-to-project@main
if: ${{ env.BOOL == 'true' }}
with:
project: "https://github.com/orgs/Senzing/projects/6"
15 changes: 9 additions & 6 deletions .github/workflows/add-issue-to-project-t-ast.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-ast.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 App-Server 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/6'
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/6"
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.

18 changes: 18 additions & 0 deletions .github/workflows/docker-build-container.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: docker-build-container.yaml

on:
pull_request:
branches:
- main
workflow_dispatch:

jobs:
docker-build-container:
runs-on: ubuntu-latest
steps:
- name: Build docker image
uses: Senzing/github-action-docker-buildx-build@latest
with:
image-repository: senzing/entity-search-web-app
password: ${{ secrets.DOCKERHUB_PASSWORD }}
username: ${{ secrets.DOCKERHUB_USERNAME }}
19 changes: 19 additions & 0 deletions .github/workflows/docker-push-containers-to-dockerhub.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
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: Build docker image and push to DockerHub
uses: Senzing/github-action-docker-buildx-build@latest
with:
build-options: "--push"
image-repository: senzing/entity-search-web-app
image-tag: ${{ github.ref_name }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
username: ${{ secrets.DOCKERHUB_USERNAME }}
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@ Thumbs.db
proxy.conf.json

.history
.vscode
15 changes: 12 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,21 @@ 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).

## [2.9.1] - 2023-09-29

### Changed in 2.9.1

- In `Dockerfile`, updated FROM instruction to:
- `node:16-bullseye-slim@sha256:503446c15c6236291222f8192513c2eb56a02a8949cbadf4fe78cce19815c734`
- `node:16-alpine3.18@sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787`

## [2.9.0] - 2023-09-09

### Changed in 2.9.0
- new graph icons.
- match keys are now shown by default in the graph.
- new why and why not report column formatting to match g2Explorer.

- new graph icons.
- match keys are now shown by default in the graph.
- new why and why not report column formatting to match g2Explorer.

### Added in 2.9.0

Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
ARG BUILD_IMAGE=node:16-bullseye-slim@sha256:7bd75ac51451826df0d46f8e1446ca806a94f64025f7d7c307dde25117815e71
ARG PROD_IMAGE=node:16-alpine3.17@sha256:77e07be8ecf734e337b1b7d8eaa44abcb87320decffc030ad073354e609aa951
ARG TEST_IMAGE=node:16-bullseye-slim@sha256:7bd75ac51451826df0d46f8e1446ca806a94f64025f7d7c307dde25117815e71
ARG BUILD_IMAGE=node:16-bullseye-slim@sha256:503446c15c6236291222f8192513c2eb56a02a8949cbadf4fe78cce19815c734
ARG PROD_IMAGE=node:16-alpine3.18@sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787
ARG TEST_IMAGE=node:16-bullseye-slim@sha256:503446c15c6236291222f8192513c2eb56a02a8949cbadf4fe78cce19815c734

FROM ${BUILD_IMAGE}
ENV REFRESHED_AT=2023-06-29
ENV REFRESHED_AT=2023-09-29

LABEL Name="senzing/entity-search-web-app" \
Maintainer="[email protected]" \
Version="2.8.0"
Version="2.9.1"

HEALTHCHECK CMD ["/app/healthcheck.sh"]

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@senzing/entity-search-web-app",
"version": "2.9.0",
"version": "2.9.1",
"license": "Apache-2.0",
"scripts": {
"ng": "ng",
Expand Down

0 comments on commit 073daaf

Please sign in to comment.