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

Merge master into vlc-support #736

Closed
wants to merge 11 commits into from
Closed

Merge master into vlc-support #736

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bc98ffa
Use pre-built ffmpeg
ispysoftware Apr 5, 2024
2304a0f
Merge pull request #704 from doitandbedone/ispysoftware-patch-2
doitandbedone Jul 7, 2024
7d4a2f4
Update ARG FILE_LOCATION from "https://ispyfiles.azureedge.net/downlo…
actions-user Jul 22, 2024
4e10359
Merge pull request #741 from doitandbedone/dockerfile-updater/1721664177
doitandbedone Jul 23, 2024
e641355
Update ARG FILE_LOCATION from "https://ispyfiles.azureedge.net/downlo…
actions-user Nov 29, 2024
9a73845
Merge pull request #764 from doitandbedone/dockerfile-updater/1732867394
doitandbedone Dec 7, 2024
6cff141
Update Dockerfile
doitandbedone Dec 11, 2024
66a1771
Merge pull request #768 from doitandbedone/fix/missingPorts
ispysoftware Dec 11, 2024
fba6556
Merge branch 'vlc-support' into master
doitandbedone Dec 11, 2024
e10aefd
Update Dockerfile
doitandbedone Dec 14, 2024
6e303dd
Merge pull request #769 from doitandbedone/Remove-optional-VLC
doitandbedone Dec 14, 2024
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
43 changes: 9 additions & 34 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM ubuntu:22.04

# Define download location variables

ARG FILE_LOCATION="https://ispyfiles.azureedge.net/downloads/Agent_Linux64_5_5_7_0.zip"
ARG FILE_LOCATION="https://ispyfiles.azureedge.net/downloads/Agent_Linux64_5_8_4_0.zip"


ENV FILE_LOCATION_SET=${FILE_LOCATION:+true}
Expand All @@ -15,7 +15,7 @@ ARG name

# Download and install dependencies
RUN apt-get update \
&& apt-get install -y wget unzip software-properties-common alsa-utils
&& apt-get install -y wget unzip software-properties-common alsa-utils apt-transport-https libxext-dev fontconfig libva-drm2

# Download/Install iSpy Agent DVR:
# Check if we were given a specific version
Expand All @@ -33,37 +33,12 @@ RUN if [ "${FILE_LOCATION_SET}" = "true" ]; then \
# Install libgdiplus, used for smart detection
RUN apt-get install -y libgdiplus

# VLC support
RUN apt-get install -y libvlc-dev vlc libx11-dev

# Install ffmpeg
RUN apt-get install -y build-essential xz-utils yasm cmake libtool libc6 libc6-dev \
pkg-config libx264-dev libx265-dev libmp3lame-dev libopus-dev \
libvorbis-dev libfdk-aac-dev libvpx-dev libva-dev

RUN wget https://ffmpeg.org/releases/ffmpeg-6.1.1.tar.gz &&\
tar xf ffmpeg-6.1.1.tar.gz &&\
cd ffmpeg-6.1.1 && \
./configure --disable-debug \
--disable-doc \
--enable-shared \
--enable-pthreads \
--enable-hwaccels \
--enable-hardcoded-tables \
--enable-vaapi \
--enable-nonfree \
--disable-static \
--enable-gpl \
--enable-libx264 \
--enable-libmp3lame \
--enable-libopus \
--enable-libvorbis \
--enable-libfdk-aac \
--enable-libx265 \
--enable-libvpx && \
make -j 8 && \
make install && \
cd ..
# Ensure the target ffmpeg directory exists
RUN mkdir -p /agent/ffmpeg6
# Download and extract the archive to the specified directory
RUN wget https://ispyrtcdata.blob.core.windows.net/downloads/ffmpeg6-linuxx64.tar.xz &&\
tar -xvf ffmpeg6-linuxx64.tar.xz --strip-components=1 -C "/agent/ffmpeg6"


# Install Time Zone
RUN apt-get install -y tzdata
Expand Down Expand Up @@ -102,7 +77,7 @@ EXPOSE 8090
EXPOSE 3478/udp

# TURN server UDP port range
EXPOSE 50000-50010/udp
EXPOSE 50000-50100/udp

# Data volumes
VOLUME ["/agent/Media/XML", "/agent/Media/WebServerRoot/Media", "/agent/Commands"]
Expand Down
Loading