From d86b00824b66d7bd47dd7fdfa8e421920bab888d Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Mon, 1 Mar 2021 20:20:54 -0500
Subject: [PATCH] Only install podman in local dev env

---
 .../ansible/roles/dockerfile/templates/Dockerfile.j2  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
index e17a0b04d828..3f7666a61571 100644
--- a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
+++ b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
@@ -148,7 +148,6 @@ RUN dnf -y install \
     nss \
     make \
     patch \
-    podman \
     socat \
     tmux \
     wget \
@@ -162,6 +161,11 @@ RUN dnf -y install \
 RUN dnf --enablerepo=debuginfo -y install python3-debuginfo || :
 {% endif %}
 
+{% if build_dev|bool %}
+RUN dnf install -y podman
+RUN echo -e 'cgroup_manager = "cgroupfs"\nevents_logger = "file"' > /etc/containers/libpod.conf
+{% endif %}
+
 # Copy app from builder
 COPY --from=builder /var/lib/awx /var/lib/awx
 
@@ -245,8 +249,6 @@ RUN ln -sf /dev/stdout /var/log/nginx/access.log && \
     ln -sf /dev/stderr /var/log/nginx/error.log
 {% endif %}
 
-RUN echo -e 'cgroup_manager = "cgroupfs"\nevents_logger = "file"' > /etc/containers/libpod.conf
-
 ENV HOME="/var/lib/awx"
 ENV PATH="/usr/pgsql-10/bin:${PATH}"
 
@@ -264,6 +266,5 @@ EXPOSE 8052
 ENTRYPOINT ["/usr/bin/tini", "--"]
 CMD /usr/bin/launch_awx.sh
 VOLUME /var/lib/nginx
-{% endif %}
-
 VOLUME /var/lib/awx/.local/share/containers/storage
+{% endif %}