incubator-metron git commit: METRON-857 Metron should one unified docker build image (ottobackwards via merrimanr) closes apache/incubator-metron#552

[rmerriman]

Repository: incubator-metron
Updated Branches:
  refs/heads/master 58fa1f69c -> ffe2d9340


METRON-857 Metron should one unified docker build image (ottobackwards via 
merrimanr) closes apache/incubator-metron#552


Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/ffe2d934
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/ffe2d934
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/ffe2d934

Branch: refs/heads/master
Commit: ffe2d934089ba6c63513759a9a740c1e34660132
Parents: 58fa1f6
Author: ottobackwards 
Authored: Wed Apr 26 09:24:07 2017 -0500
Committer: merrimanr 
Committed: Wed Apr 26 09:24:07 2017 -0500

--
 .../packaging/docker/rpm-docker/pom.xml | 57 ++--
 1 file changed, 42 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/ffe2d934/metron-deployment/packaging/docker/rpm-docker/pom.xml
--
diff --git a/metron-deployment/packaging/docker/rpm-docker/pom.xml 
b/metron-deployment/packaging/docker/rpm-docker/pom.xml
index dd1a995..ec3 100644
--- a/metron-deployment/packaging/docker/rpm-docker/pom.xml
+++ b/metron-deployment/packaging/docker/rpm-docker/pom.xml
@@ -164,21 +164,6 @@
 
 
 
-
-copy-rpms-target
-package
-
-copy-resources
-
-
-
${project.basedir}/target/RPMS
-
-
-RPMS
-
-
-
-
 
 
 
@@ -215,6 +200,27 @@
 
 
 
+
+maven-resources-plugin
+3.0.1
+
+
+copy-rpms-target
+package
+
+copy-resources
+
+
+
${project.basedir}/target/RPMS
+
+
+RPMS
+
+
+
+
+
+
 
 
 
@@ -272,6 +278,27 @@
 
 
 
+
+maven-resources-plugin
+3.0.1
+
+
+copy-rpms-target
+package
+
+copy-resources
+
+
+
${project.basedir}/target/RPMS
+
+
+RPMS
+
+
+
+
+
+
 
 
 

incubator-metron git commit: METRON-892 platform_info.sh should have the version of docker (ottobackwards) closes apache/incubator-metron#551

[otto]

Repository: incubator-metron
Updated Branches:
  refs/heads/master 6e1e322ef -> 58fa1f69c


METRON-892 platform_info.sh should have the version of docker (ottobackwards) 
closes apache/incubator-metron#551


Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/58fa1f69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/58fa1f69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/58fa1f69

Branch: refs/heads/master
Commit: 58fa1f69cf14436b54414f660ff11c2c48c99c6f
Parents: 6e1e322
Author: ottobackwards 
Authored: Wed Apr 26 10:03:42 2017 -0400
Committer: otto 
Committed: Wed Apr 26 10:03:42 2017 -0400

--
 metron-deployment/scripts/platform-info.sh | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/58fa1f69/metron-deployment/scripts/platform-info.sh
--
diff --git a/metron-deployment/scripts/platform-info.sh 
b/metron-deployment/scripts/platform-info.sh
index 79ebcac..f84d822 100755
--- a/metron-deployment/scripts/platform-info.sh
+++ b/metron-deployment/scripts/platform-info.sh
@@ -59,6 +59,10 @@ python --version 2>&1
 echo "--"
 mvn --version
 
+# docker
+echo "--"
+docker --version
+
 # operating system
 echo "--"
 uname -a
@@ -73,7 +77,7 @@ case "${OSTYPE}" in
 cat /proc/cpuinfo | grep -i '^processor' | wc -l | awk '{print "Total 
Physical Processors: " $0}'
 cat /proc/cpuinfo | grep -i cores | cut -d: -f2 | awk '{corecount+=$1} END 
{print "Total cores: " corecount}'
 echo "Disk information:"
-df -h | grep "^/" 
+df -h | grep "^/"
 ;;
   darwin*)
 sysctl hw.memsize | awk '{print "Total System Memory = " $2/1048576 " MB"}'
@@ -82,10 +86,9 @@ case "${OSTYPE}" in
 sysctl hw.physicalcpu | cut -d: -f2 | awk '{print "Total Physical 
Processors:" $0}'
 sysctl machdep.cpu | grep 'machdep.cpu.core_count' | cut -d: -f2 | cut 
-d\@ -f2 | awk '{print "Total cores:" $0}'
 echo "Disk information:"
-df -h | grep "^/" 
+df -h | grep "^/"
 ;;
   *)
 echo "Unable to detect system resources for ${OSTYPE}"
 ;;
 esac
-