Add maven 3.5.2 to all images (#12)

Fixes: #1, #8
khos2ow · Jun 19, 2018 · 23497a9 · 23497a9
1 parent 1dfc767
commit 23497a9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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