From 1250ad610666d19c2be58b001420c25620873830 Mon Sep 17 00:00:00 2001 From: Ron Lynn Date: Tue, 13 Jul 2021 12:06:24 -0700 Subject: [PATCH 1/4] 31 update senzing base version --- CHANGELOG.md | 5 ++++- Dockerfile | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 756e862..afa2e56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,14 @@ 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). +<<<<<<< Updated upstream ## [1.2.1] - 2021-07-12 ### Added to 1.2.1 - Improve permornace warning messaging +======= +>>>>>>> Stashed changes ## [1.2.0] - 2021-04-20 @@ -41,7 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added to 1.0.2 - Add `pip3 install psycopg2-binary` - + ## [1.0.1] - 2020-10-23 ### Added to 1.0.1 diff --git a/Dockerfile b/Dockerfile index ae47cd4..fbbf80f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -ARG BASE_IMAGE=senzing/senzing-base:1.5.5 +ARG BASE_IMAGE=senzing/senzing-base:1.6.0 FROM ${BASE_IMAGE} -ENV REFRESHED_AT=2021-4-16 +ENV REFRESHED_AT=2021-07-13 LABEL Name="senzing/sshd" \ Maintainer="support@senzing.com" \ - Version="1.1.0" + Version="1.3.0" HEALTHCHECK CMD ["/app/healthcheck.sh"] From e7844eb41b291de3e5b19af8bb5b763dbca7d574 Mon Sep 17 00:00:00 2001 From: Ron Lynn Date: Tue, 13 Jul 2021 12:07:30 -0700 Subject: [PATCH 2/4] 31 update senzing base version --- CHANGELOG.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index afa2e56..7e0054e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,14 +6,15 @@ 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). -<<<<<<< Updated upstream -## [1.2.1] - 2021-07-12 +## [1.3.0] - 2021-07-13 + +### Added to 1.3.0 + +- Update to Senzing base 1.6.0## [1.2.1] - 2021-07-12 ### Added to 1.2.1 - Improve permornace warning messaging -======= ->>>>>>> Stashed changes ## [1.2.0] - 2021-04-20 From 1c43d122faeff4a83f9bf171dcbae062491cb5b0 Mon Sep 17 00:00:00 2001 From: Ron Lynn Date: Tue, 13 Jul 2021 12:51:35 -0700 Subject: [PATCH 3/4] 31 updated version number --- CHANGELOG.md | 8 +++++--- Dockerfile | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e0054e..653a46f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,13 @@ 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). -## [1.3.0] - 2021-07-13 +## [1.2.2] - 2021-07-13 -### Added to 1.3.0 +### Added to 1.2.2 -- Update to Senzing base 1.6.0## [1.2.1] - 2021-07-12 +- Update to Senzing base 1.6.0 + +- ## [1.2.1] - 2021-07-12 ### Added to 1.2.1 diff --git a/Dockerfile b/Dockerfile index fbbf80f..6a9bdcb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ENV REFRESHED_AT=2021-07-13 LABEL Name="senzing/sshd" \ Maintainer="support@senzing.com" \ - Version="1.3.0" + Version="1.2.2" HEALTHCHECK CMD ["/app/healthcheck.sh"] From c47f02566ff804aeb75499f5470fd331fa977354 Mon Sep 17 00:00:00 2001 From: Ron Lynn Date: Tue, 13 Jul 2021 13:02:39 -0700 Subject: [PATCH 4/4] 31 updated the changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 653a46f..d5537cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added to 1.2.2 -- Update to Senzing base 1.6.0 +- Updated to senzing/senzing-base:1.6.0 - ## [1.2.1] - 2021-07-12