Merge pull request #6721 from shanemcd/dockerfile-cleanup

Dockerfile organization

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

installer/roles/image_build/templates/Dockerfile.j2

@@ -7,6 +7,7 @@ ENV LC_ALL en_US.UTF-8
 USER root
 
 ADD google-cloud-sdk.repo /etc/yum.repos.d/
+ADD rsyslog.repo /etc/yum.repos.d/rsyslog.repo
 
 # sync with installer/roles/image_build/templates/Dockerfile.j2
 RUN dnf -y update && \
@@ -49,6 +50,7 @@ RUN dnf -y update && \
     python3-setuptools \
     python3-pycurl \
     rsync \
+    rsyslog-omhttp \
     subversion \
     sudo \
     swig \
@@ -97,9 +99,6 @@ RUN cd /usr/local/bin && \
     curl -L https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz | \
     tar -xz --strip-components=1 --wildcards --no-anchored 'oc'
 
-ADD rsyslog.repo /etc/yum.repos.d/rsyslog.repo
-RUN yum install -y rsyslog-omhttp
-
 # Pre-create things that we need to write to
 RUN for dir in /home/awx /var/run/supervisor /var/lib/awx /var/lib/awx/rsyslog /var/lib/awx/rsyslog/conf.d /var/run/awx-rsyslog /var/log/tower /var/log/nginx /var/lib/nginx; \
     do mkdir -p $dir; chmod -R g+rwx $dir; chgrp -R root $dir; done && \