From ff8529cb0c64c8018cd8a23c0823679ad8cb2d1a Mon Sep 17 00:00:00 2001
From: Jeff Cantrill <jcantril@redhat.com>
Date: Thu, 18 Nov 2021 16:22:01 -0500
Subject: [PATCH] LOG-1927: Remove devel packages from final image (e.g gcc)

---
 fluentd/Dockerfile      | 2 ++
 fluentd/Dockerfile.in   | 2 ++
 kibana/Dockerfile       | 2 +-
 kibana/origin-meta.yaml | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/fluentd/Dockerfile b/fluentd/Dockerfile
index 95b35940a..61279d7a4 100644
--- a/fluentd/Dockerfile
+++ b/fluentd/Dockerfile
@@ -63,6 +63,8 @@ COPY  ${upstream_code}/*.patch ${HOME}/vendored_gem_src/
 RUN cd ${HOME}/vendored_gem_src/ && ./install-gems.sh && cd / && rm -rf ${HOME}/vendored_gem_src/
 
 RUN BUILD_PKGS="make gcc-c++ libffi-devel \
+                gcc gcc-gdb-plugin cpp \
+                nodejs \
                 autoconf automake libtool m4 \
                 redhat-rpm-config" && \
     yum remove -y $BUILD_PKGS
diff --git a/fluentd/Dockerfile.in b/fluentd/Dockerfile.in
index 1d165a7ce..973c38036 100644
--- a/fluentd/Dockerfile.in
+++ b/fluentd/Dockerfile.in
@@ -81,6 +81,8 @@ COPY --from=builder ${upstream_code}/*.patch ${HOME}/vendored_gem_src/
 RUN cd ${HOME}/vendored_gem_src/ && ./install-gems.sh && cd / && rm -rf ${HOME}/vendored_gem_src/
 
 RUN BUILD_PKGS="make gcc-c++ libffi-devel \
+                gcc gcc-gdb-plugin cpp \
+                nodejs \
                 autoconf automake libtool m4 \
                 redhat-rpm-config" && \
     yum remove -y $BUILD_PKGS
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index e452aa9bb..4160b791c 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,7 +1,7 @@
 ### This is a generated file from Dockerfile.in ###
 
 #@follow_tag(registry-proxy.engineering.redhat.com/rh-osbs/ubi8-nodejs-10:latest)
-FROM registry.ci.openshift.org/ocp/builder:ubi8.nodejs.10
+FROM registry.ci.openshift.org/ocp/builder:rhel8.2.els.nodejs.10
 ENV BUILD_VERSION=6.8.1
 ENV SOURCE_GIT_COMMIT=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_COMMIT:-}
 ENV SOURCE_GIT_URL=${CI_ORIGIN_AGGREGATED_LOGGING_UPSTREAM_URL:-}
diff --git a/kibana/origin-meta.yaml b/kibana/origin-meta.yaml
index 93f348d7e..bc895b847 100644
--- a/kibana/origin-meta.yaml
+++ b/kibana/origin-meta.yaml
@@ -1,3 +1,3 @@
 from:
 - source: registry-proxy.engineering.redhat.com/rh-osbs/ubi8-nodejs-10:(\d)-(?:[\.0-9\-]*)
-  target: registry.ci.openshift.org/ocp/builder:ubi8.nodejs.10 
+  target: registry.ci.openshift.org/ocp/builder:rhel8.2.els.nodejs.10