diff --git a/makefiles/Makefile.port b/makefiles/Makefile.port
index c817404ba3..61ba9093f7 100755
--- a/makefiles/Makefile.port
+++ b/makefiles/Makefile.port
@@ -29,6 +29,8 @@ ifeq ("$(SYSTEM)","unix")
       CANDIDATE_JDK_ROOTS = \
         /usr/local/buildtools/java/jdk-64 \
         /usr/lib/jvm/java-1.7.0-openjdk.x86_64 \
+        /usr/lib/jvm/java-1.8.0-openjdk \
+        /usr/lib/jvm/java-1.7.0-openjdk \
         /usr/lib64/jvm/java-1.6.0-openjdk-1.6.0 \
         /usr/lib64/jvm/java-6-sun-1.6.0.26 \
         /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64 \
diff --git a/tools/docker/centos-7.Dockerfile b/tools/docker/centos-7.Dockerfile
index 24353e41e7..583f7d9fd5 100644
--- a/tools/docker/centos-7.Dockerfile
+++ b/tools/docker/centos-7.Dockerfile
@@ -8,7 +8,27 @@ RUN rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E03
 
 RUN yum-config-manager --add-repo http://download.mono-project.com/repo/centos7/
 
-RUN yum -y install wget git autoconf libtool zlib-devel gawk gcc-c++ curl cmake subversion make mono-devel redhat-lsb-code python-devel java-1.8.0-openjdk twine python-setuptools python-six python-wheel python3-wheel pcre-devel
+RUN yum -y \
+    install \
+    wget \
+    git \
+    autoconf \
+    libtool \
+    zlib-devel \
+    gawk \
+    gcc-c++ \
+    curl \
+    subversion \
+    make \
+    mono-devel \
+    redhat-lsb-core \
+    python-devel \
+    java-1.8.0-openjdk \
+    java-1.8.0-openjdk-devel \
+    python-setuptools \
+    python-six \
+    python-wheel \
+    pcre-devel which
 
 ENV TZ=America/Los_Angeles
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone