Merge pull request #18 from chancez/okd_shaded_jar

Dockerfile.okd: Use shaded GCS jar in OKD image

Author: openshift-merge-robot

Dockerfile

@@ -59,8 +59,7 @@ FROM centos:7
 COPY faq.repo /etc/yum.repos.d/ecnahc515-faq-epel-7.repo
 
 RUN yum install --setopt=skip_missing_names_on_install=False -y epel-release
-RUN yum -y update && \
-    yum install --setopt=skip_missing_names_on_install=False -y \
+RUN set -x; yum install --setopt=skip_missing_names_on_install=False -y \
         java-1.8.0-openjdk \
         java-1.8.0-openjdk-devel \
         curl \

Dockerfile.okd

@@ -52,16 +52,11 @@ RUN scl enable rh-maven33 'cd /build && mvn -B -e -Dtest=false -DskipTests -Dmav
 RUN scl enable rh-maven33 'mvn dependency:get -Dartifact=io.prometheus.jmx:jmx_prometheus_javaagent:0.3.1:jar -Ddest=/build/jmx_prometheus_javaagent.jar'
 
 # Get gcs-connector for Hadoop
-RUN scl enable rh-maven33 'cd /build && mvn dependency:get -Dartifact=com.google.cloud.bigdataoss:gcs-connector:hadoop3-2.0.0-RC2:jar && mv $HOME/.m2/repository/com/google/cloud/bigdataoss/gcs-connector/hadoop3-2.0.0-RC2/gcs-connector-hadoop3-2.0.0-RC2.jar /build/gcs-connector-hadoop3-2.0.0-RC2.jar'
+RUN scl enable rh-maven33 'cd /build && mvn dependency:get -Dartifact=com.google.cloud.bigdataoss:gcs-connector:hadoop3-2.0.0-RC2:jar:shaded && mv $HOME/.m2/repository/com/google/cloud/bigdataoss/gcs-connector/hadoop3-2.0.0-RC2/gcs-connector-hadoop3-2.0.0-RC2-shaded.jar /build/gcs-connector-hadoop3-2.0.0-RC2-shaded.jar'
 
 FROM quay.io/openshift/origin-base:latest
 
-# our copy of faq and jq
-COPY faq.repo /etc/yum.repos.d/ecnahc515-faq-epel-7.repo
-
-RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-RUN yum -y update && \
-    yum install --setopt=skip_missing_names_on_install=False -y \
+RUN set -x; yum install --setopt=skip_missing_names_on_install=False -y \
         java-1.8.0-openjdk \
         java-1.8.0-openjdk-devel \
         curl \

Dockerfile.rhel

@@ -39,8 +39,7 @@ RUN set -x; curl -fSLs \
 
 FROM rhel7:7-released
 
-RUN yum -y update && \
-    yum install --setopt=skip_missing_names_on_install=False -y \
+RUN set -x; yum install --setopt=skip_missing_names_on_install=False -y \
         java-1.8.0-openjdk \
         java-1.8.0-openjdk-devel \
         curl \