Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jammy 1.36 es #209

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Jammy 1.36 es #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18e1c21
Update Dockerfile jammy, opencv, php
jdpc86 May 20, 2023
861c7bd
update ubuntu to 22.04, opencv to 4.7, ES to 6.1.28
jdpc86 May 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM phusion/baseimage:master as builder
FROM phusion/baseimage:jammy-1.0.1 as builder

LABEL maintainer="dlandon"

Expand All @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions zmeventnotification/zm_detect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -556,4 +556,4 @@ def main_handler():
g.logger.close()
else:
print('Unrecoverable error:{} Traceback:{}'.format(e,traceback.format_exc()))
exit(1)
exit(1)
2 changes: 1 addition & 1 deletion zmeventnotification/zmes_hook_helpers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__version__ = "6.1.23"
__version__ = "6.1.28"
VERSION=__version__
2 changes: 1 addition & 1 deletion zmeventnotification/zmeventnotification.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down