Skip to content

Commit

Permalink
Only install podman in local dev env
Browse files Browse the repository at this point in the history
  • Loading branch information
shanemcd committed Mar 2, 2021
1 parent 59e2b1d commit d86b008
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions tools/ansible/roles/dockerfile/templates/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ RUN dnf -y install \
nss \
make \
patch \
podman \
socat \
tmux \
wget \
Expand All @@ -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

Expand Down Expand Up @@ -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}"

Expand All @@ -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 %}

0 comments on commit d86b008

Please sign in to comment.