Merge pull request apache#10 from chancez/add_faq_openssl

Add faq/openssl to image

Author: openshift-merge-robot

Dockerfile

@@ -52,6 +52,9 @@ RUN scl enable rh-maven33 'mvn dependency:get -Dartifact=io.prometheus.jmx:jmx_p
 
 FROM centos:7
 
+# our copy of faq and jq
+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 \
     && yum install --setopt=skip_missing_names_on_install=False -y \
@@ -65,6 +68,8 @@ RUN yum install --setopt=skip_missing_names_on_install=False -y \
         which \
         jq \
         rsync \
+        openssl \
+        faq \
     && yum clean all \
     && rm -rf /tmp/* /var/tmp/*
 

Dockerfile.rhel

@@ -50,6 +50,8 @@ RUN yum install --setopt=skip_missing_names_on_install=False -y \
         which \
         jq \
         rsync \
+        openssl \
+        faq \
     && yum clean all \
     && rm -rf /tmp/* /var/tmp/*
 

faq.repo

@@ -0,0 +1,10 @@
+[ecnahc515-faq]
+name=Copr repo for faq owned by ecnahc515
+baseurl=https://copr-be.cloud.fedoraproject.org/results/ecnahc515/faq/epel-7-$basearch/
+type=rpm-md
+skip_if_unavailable=False
+gpgcheck=1
+gpgkey=https://copr-be.cloud.fedoraproject.org/results/ecnahc515/faq/pubkey.gpg
+repo_gpgcheck=0
+enabled=1
+enabled_metadata=1