From a069ff80fa259d6717c11fd10d67bc73c2a37fa4 Mon Sep 17 00:00:00 2001
From: Ryan Faircloth <35384120+rfaircloth-splunk@users.noreply.github.com>
Date: Fri, 16 Aug 2019 12:53:36 -0400
Subject: [PATCH] Update Dockerfile (#48)

* Update Dockerfile

Remove wild card enable of repo which was not required fixes #47

* Update clair-whitelist.yml

Fixes #49
---
 clair-whitelist.yml | 4 ++++
 package/Dockerfile  | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/clair-whitelist.yml b/clair-whitelist.yml
index 979a352..586bcb7 100644
--- a/clair-whitelist.yml
+++ b/clair-whitelist.yml
@@ -15,6 +15,10 @@ generalwhitelist:
     RHSA-2018:2772: False Positive
     RHSA-2018:1374: False Positive
     RHSA-2018:0180: False Positive
+    RHSA-2019:2029: False Positive
+    RHSA-2019:1873: False Positive
+
+
 
 images:
     scs:
diff --git a/package/Dockerfile b/package/Dockerfile
index 7c47a5a..cba55f8 100644
--- a/package/Dockerfile
+++ b/package/Dockerfile
@@ -17,8 +17,7 @@ ENV DISTCHECK_CONFIGURE_FLAGS="--prefix=/opt/syslog-ng --with-ivykis=system --wi
 COPY confluent.repo /etc/yum.repos.d/confluent.repo
 RUN subscription-manager register --org=$RH_ORG --activationkey=$RH_ACTIVATION --force
 RUN subscription-manager repos --enable=rhel-7-server-extras-rpms --enable=rhel-7-server-optional-rpms --enable=rhel-server-rhscl-7-rpms
-RUN subscription-manager repos --enable "rhel-*-optional-rpms" --enable "rhel-*-extras-rpms"  --enable "rhel-ha-for-rhel-*-server-rpms"
-RUN yum install wget -y
+RUN yum update -y; yum install wget -y
 RUN rpm --import https://packages.confluent.io/rpm/5.2/archive.key
 RUN cd /tmp ;\
     wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm ;\