From 23497a901937b4898f83f9691133e680af887e49 Mon Sep 17 00:00:00 2001
From: Khosrow Moossavi <khos2ow@gmail.com>
Date: Tue, 19 Jun 2018 15:45:59 -0400
Subject: [PATCH] Add maven 3.5.2 to all images (#12)

Fixes: #1, #8
---
 centos6/Dockerfile           | 10 ++++++++--
 centos6/docker-entrypoint.sh |  2 +-
 centos7/Dockerfile           | 10 ++++++++--
 centos7/docker-entrypoint.sh |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/centos6/Dockerfile b/centos6/Dockerfile
index 988cd50..f60df9a 100644
--- a/centos6/Dockerfile
+++ b/centos6/Dockerfile
@@ -32,7 +32,6 @@ RUN \
         createrepo \
         mkisofs \
         git \
-        maven \
         java-1.8.0-openjdk-devel \
         tomcat \
         python-argparse \
@@ -43,11 +42,18 @@ RUN \
         gcc \
         gcc-c++ \
         jq \
+        wget \
         ws-commons-util && \
     yum upgrade python-setuptools && \
     yum clean all && rm -rf /var/cache/yum
 
-ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk
+ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0
+
+# maven
+RUN wget http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-maven.repo -O /etc/yum.repos.d/epel-apache-maven.repo && \
+    yum clean metadata && \
+    yum install -y \
+        apache-maven
 
 VOLUME /mnt/build
 WORKDIR /mnt/build
diff --git a/centos6/docker-entrypoint.sh b/centos6/docker-entrypoint.sh
index 20a39b1..8f5cf88 100755
--- a/centos6/docker-entrypoint.sh
+++ b/centos6/docker-entrypoint.sh
@@ -123,7 +123,7 @@ if [ -d "${workspace_path}" ]; then
             echo "Error: Could not clone remote git repository, '${workspace_path}' exists"
             exit 1
         else
-            echo -e "\e[0;32mRemoving ${workspace_path} ...\e[0m"
+            echo -e "\e[0;32mremoving ${workspace_path} ...\e[0m"
             rm -rf ${workspace_path}
             echo ""
         fi
diff --git a/centos7/Dockerfile b/centos7/Dockerfile
index 26c065d..b3a0187 100644
--- a/centos7/Dockerfile
+++ b/centos7/Dockerfile
@@ -32,7 +32,6 @@ RUN \
         createrepo \
         mkisofs \
         git \
-        maven \
         java-1.8.0-openjdk-devel \
         tomcat \
         python-argparse \
@@ -43,11 +42,18 @@ RUN \
         gcc \
         gcc-c++ \
         jq \
+        wget \
         ws-commons-util && \
     yum upgrade python-setuptools && \
     yum clean all && rm -rf /var/cache/yum
 
-ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk
+ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0
+
+# maven
+RUN wget http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-maven.repo -O /etc/yum.repos.d/epel-apache-maven.repo && \
+    yum clean metadata && \
+    yum install -y \
+        apache-maven
 
 VOLUME /mnt/build
 WORKDIR /mnt/build
diff --git a/centos7/docker-entrypoint.sh b/centos7/docker-entrypoint.sh
index 20a39b1..8f5cf88 100755
--- a/centos7/docker-entrypoint.sh
+++ b/centos7/docker-entrypoint.sh
@@ -123,7 +123,7 @@ if [ -d "${workspace_path}" ]; then
             echo "Error: Could not clone remote git repository, '${workspace_path}' exists"
             exit 1
         else
-            echo -e "\e[0;32mRemoving ${workspace_path} ...\e[0m"
+            echo -e "\e[0;32mremoving ${workspace_path} ...\e[0m"
             rm -rf ${workspace_path}
             echo ""
         fi