Merge branch 'master' into m

2k13yr · Jan 25, 2018 · 0bd1ee5 · 0bd1ee5
2 parents c930a7c + ce19c65
commit 0bd1ee5
Show file tree

Hide file tree

Showing 16 changed files with 256 additions and 383 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -5,6 +5,8 @@ You should only file an issue if you found a bug.  Feature and enhancement reque
 
 **Do not post feature or enhancement requests, general discussions or support questions here.**
 
+Docker related issues should be posted here: https://github.com/ZoneMinder/zmdockerfiles
+
 Make sure you are running the latest version of ZoneMinder before reporting an issue.
 
 **ZoneMinder Version (`zmaudit.pl -v`):**

diff --git a/.travis.yml b/.travis.yml
@@ -28,7 +28,6 @@ env:
   - OS=el DIST=6
   - OS=el DIST=6 ARCH=i386 DOCKER_REPO=knnniggett/packpack
   - OS=el DIST=7
-  - OS=fedora DIST=25
   - OS=fedora DIST=26 DOCKER_REPO=knnniggett/packpack
   - OS=fedora DIST=27 DOCKER_REPO=knnniggett/packpack
   - OS=ubuntu DIST=trusty

diff --git a/Dockerfile b/Dockerfile
diff --git a/README.md b/README.md
@@ -13,6 +13,10 @@ ZoneMinder is an integrated set of applications which provide a complete surveil
 Before creating an issue in our github forum, please read our posting rules:
 https://github.com/ZoneMinder/ZoneMinder/wiki/Github-Posting-Rules
 
+## Our Dockerfile has moved
+Please file issues against the ZoneMinder Dockerfile here: 
+https://github.com/ZoneMinder/zmdockerfiles
+
 ## Installation Methods
 
 ### Building from Source is Discouraged