Commit Graph

30 Commits

Author SHA1 Message Date
Ravaka Razafimanantsoa 214d9898a3 Enchancing Dockerfile and docker execution (#1898)
* Enchancing Dockerfile and docker execution

* Setting database if does not exist\nSolving SQL problem when adding monitor

* Sharing events and images

* Dockerfile a little bit more flexible

* Setting better start command
2017-06-06 20:22:37 -04:00
Andrew Bauer 8fc199c65e Merge branch 'master' into 1786-Dockerfile-Xenial 2017-05-10 08:15:42 -05:00
Matthew Noorenberghe a1f0ec3ecf Use misc/apache.conf instead of utils/docker/apache-vhost in docker
This avoids duplication and fixes a few things that were missing in the Docker version for modern Apache:
* AllowOverride All
* Require all granted

Deleted `ServerName @WEB_HOST@` since `WEB_HOST` was never defined in ZM code so it would give an Apache error.
2017-04-02 21:54:49 -07:00
Markos Vakondios ef8f5ceb23 Dockerfile Xenial & php 7 support 2017-02-18 00:17:18 +02:00
Markos Vakondios 2bfb28c079 Merged Dockerfile from feature-h264-videostorage to master 2017-02-17 23:34:17 +02:00
Michaël Arnauts c3da373b1b Disable SSH 2017-02-14 10:52:00 +01:00
Toby 6a097393ba Run Docker db/apache setup once, not on every startup; kill mysql cleanly 2016-06-02 12:06:21 +10:00
Toby d2e83d197d Improve Docker build; reduce image size & layer count
Reducing layer count improves Docker performance, and is best-practice.
Avoid packing & sending .git tree into Docker build system.
Clean up apt archives to reduce image size.
2016-06-02 10:51:41 +10:00
Dmitry Smirnov 5bcc414038 codespell: misc. spelling corrections
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11:00
Sander Alberink b0c5aa511a Migrate to cmake for building.
Also ensure that content is properly symlinked.
2016-02-05 14:02:20 +01:00
Sander Alberink bd3e79015b Fix Dockerfile
- migrate to Ubuntu Trusty Tahr, which is the latest LTS release
- add a user that is allowed to login via SSH
- Fix apache configuration
2016-02-01 12:39:43 +01:00
Isaac Connor 9272773afa Revert "Revert "Update Dockerfile""
This reverts commit 721b00b427.
2015-07-14 16:05:04 -04:00
Isaac Connor 721b00b427 Revert "Update Dockerfile"
This reverts commit a7f5b31692.
2015-07-14 16:03:43 -04:00
Andrew Bauer a7f5b31692 Update Dockerfile
update dockerfile package requirements, particularly switch out ffmpeg packages for libav.
2015-07-14 07:12:26 -05:00
SteveGilvarry 820208c2ef Removed line adding Universe repo as already in images 2014-10-11 17:29:46 +11:00
Andrew Bauer 12412ff5ca Merge branch 'patch-docker' of https://github.com/hamiltont/ZoneMinder into hamiltont-patch-docker
Conflicts:
	Dockerfile
2014-10-09 15:32:09 -05:00
Hamilton Turner f2dbb1fe08 Dockerfile works properly, documentation updated
- Dockerfile now builds properly
- Dockerfile now ADDs files from local directory. This allows
  you to either pull from github (for master) or to build
  locally (for development)
- Removes some dependencies from container (wget, git)
- Removes pulling apache virtual host file from github
- Upgrades MySQL start check to actually check instead of just
  sleeping
2014-04-18 12:39:05 -04:00
Kyle Johnson cf3283b1a1 Merge pull request #393 from hamiltont/patch-4
Remove Subversion from prerequesite lists
2014-04-18 09:36:54 -04:00
Hamilton Turner e5d2f6af7a Remove Subversion from prerequesite lists 2014-04-18 02:53:16 -04:00
Hamilton Turner 7b62780292 Remove apt-get upgrade
Convention is to avoid this if not needed, as there is no init 
system and some packages have to be held back. upgrade will 
sometimes break due to the state of ubuntu:latest

To see the official issue: dotcloud/docker#1724
To see workarounds: https://github.com/racker/docker-ubuntu-with-updates/blob/master/precise/Dockerfile
2014-04-17 23:05:23 -04:00
Kyle Johnson c553bbf98d Use the right libcurl package 2014-03-14 12:24:12 -04:00
Kyle Johnson fb0d9d063c Added the vlc sourcetype prereqs 2014-03-14 12:02:37 -04:00
Kyle Johnson 61c5658abf Added a readme for the Docker stuff 2014-01-27 14:03:51 -05:00
Kyle Johnson d1baa4e35b Reworked Dockerfile, closer to a push-button system 2014-01-27 09:39:59 -05:00
Kyle Johnson df34010f2a Added a hack for upstart 2014-01-24 19:43:08 -05:00
Kyle Johnson b3afc7bee7 Enable universe in the Docker container [ci skip] 2014-01-24 14:14:14 -05:00
Kyle Johnson f434363542 Add wget to Dockerfile prereq 2014-01-24 14:08:22 -05:00
Kyle Johnson 066afaa689 Let the conatiner know that there is no tty 2014-01-24 13:49:27 -05:00
Kyle Johnson 635c0f5a20 Split out installing prereqs into 3 steps (DB, Apache, ZM) in Dockerfile 2014-01-24 13:48:43 -05:00
Kyle Johnson 6a9d24b957 Initial commit of Dockerfile 2014-01-24 11:03:02 -05:00