diff --git a/CHANGELOG.md b/CHANGELOG.md index d00cd49..38e4e9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ ## Change Log +### 2023-05-20 +- Update Ubuntu to 22.04 +- Update zmNinja Event Notification Server to version 6.1.28. +- Update Opencv to 4.7.0 + ### 2021.10.29 - Fix update issue with mariadb. diff --git a/Dockerfile b/Dockerfile index 642fb68..3feb00a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM phusion/baseimage:master as builder +FROM phusion/baseimage:jammy-1.0.1 as builder LABEL maintainer="dlandon" @@ -11,9 +11,9 @@ ENV DEBCONF_NONINTERACTIVE_SEEN="true" \ LANGUAGE="en_US.UTF-8" \ TZ="Etc/UTC" \ TERM="xterm" \ - PHP_VERS="7.4" \ + PHP_VERS="8.2" \ ZM_VERS="1.36" \ - OPENCV_VERS="4.5.3" \ + OPENCV_VERS="4.7.0" \ PUID="99" \ PGID="100" diff --git a/zmeventnotification/zm_detect.py b/zmeventnotification/zm_detect.py index a6aedc7..1ba3b00 100644 --- a/zmeventnotification/zm_detect.py +++ b/zmeventnotification/zm_detect.py @@ -31,7 +31,7 @@ auth_header = None -__app_version__ = '6.1.23' +__app_version__ = '6.1.28' def remote_detect(stream=None, options=None, api=None, args=None): # This uses mlapi (https://github.com/pliablepixels/mlapi) to run inferencing and converts format to what is required by the rest of the code. @@ -556,4 +556,4 @@ def main_handler(): g.logger.close() else: print('Unrecoverable error:{} Traceback:{}'.format(e,traceback.format_exc())) - exit(1) \ No newline at end of file + exit(1) diff --git a/zmeventnotification/zmes_hook_helpers/__init__.py b/zmeventnotification/zmes_hook_helpers/__init__.py index 3fcec66..5f827d1 100644 --- a/zmeventnotification/zmes_hook_helpers/__init__.py +++ b/zmeventnotification/zmes_hook_helpers/__init__.py @@ -1,2 +1,2 @@ -__version__ = "6.1.23" +__version__ = "6.1.28" VERSION=__version__ diff --git a/zmeventnotification/zmeventnotification.pl b/zmeventnotification/zmeventnotification.pl index 626d2ad..2470f7e 100644 --- a/zmeventnotification/zmeventnotification.pl +++ b/zmeventnotification/zmeventnotification.pl @@ -54,7 +54,7 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; #################################### -my $app_version = '6.1.23'; +my $app_version = '6.1.28'; #################################### # do this before any log init etc.