Skip to content

Commit

Permalink
Merge pull request #802 from roflcoopter/feature/events-filter
Browse files Browse the repository at this point in the history
Events page multiple camera layout and stability improvements
  • Loading branch information
roflcoopter authored Aug 28, 2024
2 parents 65e8ed7 + b8065c9 commit 94e014c
Show file tree
Hide file tree
Showing 51 changed files with 1,514 additions and 830 deletions.
10 changes: 5 additions & 5 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ ARG OPENCV_VERSION
ARG FFMPEG_VERSION
ARG WHEELS_VERSION
ARG UBUNTU_VERSION
FROM roflcoopter/${ARCH}-opencv:${OPENCV_VERSION} as opencv
FROM roflcoopter/${ARCH}-ffmpeg:${FFMPEG_VERSION} as ffmpeg
FROM roflcoopter/${ARCH}-wheels:${WHEELS_VERSION} as wheels
FROM roflcoopter/${ARCH}-opencv:${OPENCV_VERSION} AS opencv
FROM roflcoopter/${ARCH}-ffmpeg:${FFMPEG_VERSION} AS ffmpeg
FROM roflcoopter/${ARCH}-wheels:${WHEELS_VERSION} AS wheels

# Build GPAC
FROM roflcoopter/${ARCH}-base:${BASE_VERSION} as gpac
FROM roflcoopter/${ARCH}-base:${BASE_VERSION} AS gpac

ENV \
DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -40,7 +40,7 @@ RUN \


# Build frontend
FROM node:20.10.0 as frontend
FROM node:20.10.0 AS frontend

WORKDIR /frontend

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,8 @@
"Last message repeated",
"non-existing PPS 0 referenced",
"no frame!",
"decode_slice_header error"
"decode_slice_header error",
"failed to delete old segment"
]
},
{
Expand Down
Loading

0 comments on commit 94e014c

Please sign in to comment.