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

Implemented multiarch support #547

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

Implemented multiarch support #547

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0043923
Initial commit that works on ARM systems
grinco Jan 19, 2023
d909db4
Implemented multiarchitecture support
grinco Jan 30, 2023
b28c2f5
Cleaned up the code.
grinco Jan 31, 2023
02f12b2
Merge branch 'master' into master
grinco Feb 15, 2023
720540d
Adjusting the arch for the specific archive when given
grinco Feb 15, 2023
71bdaef
Bumped to 4.6.6.0
grinco Mar 31, 2023
b843871
Update to 4_7_2_0
grinco Apr 24, 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
65 changes: 33 additions & 32 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,52 @@
# Use Ubuntu LTS
FROM ubuntu:22.04

# Define download location variables

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


ENV FILE_LOCATION_SET=${FILE_LOCATION:+true}
ENV DEFAULT_FILE_LOCATION="https://www.ispyconnect.com/api/Agent/DownloadLocation4?platform=Linux64&fromVersion=0"
ARG DEBIAN_FRONTEND=noninteractive
ARG TZ=America/Los_Angeles
ARG name

# Use latest ubuntu version with ffmpeg5
FROM ubuntu:22.10

# Download and install dependencies
RUN apt-get update \
&& apt-get install -y wget unzip software-properties-common alsa-utils

# Download/Install iSpy Agent DVR:
# Check if we were given a specific version
RUN if [ "${FILE_LOCATION_SET}" = "true" ]; then \
echo "Downloading from specific location: ${FILE_LOCATION}" && \
wget -c ${FILE_LOCATION} -O agent.zip; \
else \
#Get latest instead
echo "Downloading latest" && \
wget -c $(wget -qO- "https://www.ispyconnect.com/api/Agent/DownloadLocation4?platform=Linux64&fromVersion=0" | tr -d '"') -O agent.zip; \
fi && \
unzip agent.zip -d /agent && \
rm agent.zip

# Install libgdiplus, used for smart detection
RUN apt-get install -y libgdiplus

# Install ffmpeg
RUN add-apt-repository -y ppa:savoury1/ffmpeg4 && \
add-apt-repository -y ppa:savoury1/ffmpeg5 && \
apt-get update && \
apt-get upgrade -y && \
apt-get install -y ffmpeg
RUN apt-get install -y ffmpeg

# Install Time Zone
RUN apt-get install -y tzdata

# Install curl, used for calling external webservices in Commands
RUN apt-get install -y curl


#Define download location variables
ENV FILE_LOCATION="https://ispyfiles.azureedge.net/downloads/Agent_Linux64_4_7_2_0.zip"
ENV FILE_LOCATION_SET=${FILE_LOCATION:+true}
ENV DEFAULT_FILE_LOCATION="https://www.ispyconnect.com/api/Agent/DownloadLocation4?platform=Linux64&fromVersion=0"
ARG DEBIAN_FRONTEND=noninteractive
ARG TZ=America/Los_Angeles
ARG name

# Download/Install iSpy Agent DVR:
# Detect the arch
RUN arch=$(dpkg --print-architecture) && \
echo "Adjusting architecture to $arch" && \
if [ "$arch" = "arm64" ]; then \
DEFAULT_FILE_LOCATION=$(echo ${DEFAULT_FILE_LOCATION} | sed -e 's/Linux64/LinuxARM64/'); \
FILE_LOCATION=$(echo ${FILE_LOCATION} | sed -e 's/Linux64/LinuxARM64/'); \
fi &&\
# Check if we were given a specific version
if [ "${FILE_LOCATION_SET}" = "true" ]; then \
echo "Downloading from specific location: ${FILE_LOCATION}" && \
wget -c ${FILE_LOCATION} -O agent.zip; \
else \
#Get latest instead
arch=$(dpkg --print-architecture) && \
echo "Downloading latest" && \
wget -c $(wget -qO- ${DEFAULT_FILE_LOCATION} | tr -d '"') -O agent.zip; \
fi && \
unzip agent.zip -d /agent && \
rm agent.zip

# Clean up
RUN apt-get -y --purge remove unzip wget \
&& apt autoremove -y \
Expand Down