ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1772 from markosv/1771-h264-dockerfile 

Dockerfile to build feature-h264-videostorage
This commit is contained in:
Steve Gilvarry 2017-02-14 21:28:00 +11:00 committed by GitHub
parent 05f3944cc6 13f8d7dba0
commit 5b6a75d171
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile
View File

@ -1,7 +1,7 @@
# ZoneMinder # ZoneMinder
FROM ubuntu:trusty FROM ubuntu:xenial
MAINTAINER Kyle Johnson <kjohnson@gnulnx.net> MAINTAINER Markos Vakondios <mvakondios@gmail.com>
# Resynchronize the package index files # Resynchronize the package index files
RUN apt-get update && \ RUN apt-get update && \
@ -10,8 +10,8 @@ RUN apt-get update && \
libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 \ libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 \
libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm cmake libjpeg-turbo8-dev \ libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm cmake libjpeg-turbo8-dev \
libjpeg-turbo8 libtheora-dev libvorbis-dev libvpx-dev libx264-dev libmp4v2-dev libav-tools mysql-client \ libjpeg-turbo8 libtheora-dev libvorbis-dev libvpx-dev libx264-dev libmp4v2-dev libav-tools mysql-client \
apache2 php5 php5-mysql apache2-mpm-prefork libapache2-mod-php5 php5-cli openssh-server \ apache2 php php-mysql libapache2-mod-php php-cli openssh-server \
mysql-server libvlc-dev libvlc5 libvlccore-dev libvlccore7 vlc-data libcurl4-openssl-dev \ mysql-server libvlc-dev libvlc5 libvlccore-dev libvlccore8 vlc-data libcurl4-openssl-dev \
libavformat-dev libswscale-dev libavutil-dev libavcodec-dev libavfilter-dev \ libavformat-dev libswscale-dev libavutil-dev libavcodec-dev libavfilter-dev \
libavresample-dev libavdevice-dev libpostproc-dev libv4l-dev libtool libnetpbm10-dev \ libavresample-dev libavdevice-dev libpostproc-dev libv4l-dev libtool libnetpbm10-dev \
libmime-lite-perl dh-autoreconf dpatch \ libmime-lite-perl dh-autoreconf dpatch \
@ -47,7 +47,7 @@ RUN mkdir /var/run/sshd
# Adding apache virtual hosts file # Adding apache virtual hosts file
ADD utils/docker/apache-vhost /etc/apache2/sites-available/000-default.conf ADD utils/docker/apache-vhost /etc/apache2/sites-available/000-default.conf
ADD utils/docker/phpdate.ini /etc/php5/apache2/conf.d/25-phpdate.ini ADD utils/docker/phpdate.ini /etc/php/7.0/apache2/conf.d/25-phpdate.ini
# Set the root passwd # Set the root passwd
RUN echo 'root:root' | chpasswd RUN echo 'root:root' | chpasswd

5
utils/docker/setup.sh
View File

@ -1,7 +1,10 @@
#!/bin/bash #!/bin/bash
# Start MySQL # Start MySQL
/usr/bin/mysqld_safe & # For Xenial the following won't start mysqld
#/usr/bin/mysqld_safe &
# Use this instead:
service mysql start
# Give MySQL time to wake up # Give MySQL time to wake up
SECONDS_LEFT=120 SECONDS_LEFT=120