summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2019-02-20 09:33:36 -0500
committerDan Prince <dprince@redhat.com>2019-02-20 14:41:15 +0000
commit8f0c6bf141da1740c47188737b95f347af8b69cf (patch)
treed9aaefc45e2ce6167bbb436360268fdf5c1b1329
parent410408ef1b665aab4672d4b3dad2bbc7de543b7d (diff)
Fix dev install (yum -y...)
Fixes an issue in 410408ef1b665aab4672d4b3dad2bbc7de543b7d where we removed the -y options for the pip RPM install. This functionally broke the dev mode playbook unless you had manually installed pip in the container (not normally the case for RDO images). Change-Id: Ic96d9eb708bff763cbe4395cf7770b5239879309 Closes-bug: #1816775
Notes
Notes (review): Code-Review+2: Bogdan Dobrelya <bdobreli@redhat.com> Workflow+1: Emilien Macchi <emilien@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 20 Feb 2019 22:10:28 +0000 Reviewed-on: https://review.openstack.org/638174 Project: openstack/ansible-role-tripleo-modify-image Branch: refs/heads/master
-rw-r--r--templates/Dockerfile-dev.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/Dockerfile-dev.j2 b/templates/Dockerfile-dev.j2
index b71bada..4cbf649 100644
--- a/templates/Dockerfile-dev.j2
+++ b/templates/Dockerfile-dev.j2
@@ -6,7 +6,7 @@ USER root
6COPY refspec_projects /root/refspec_projects 6COPY refspec_projects /root/refspec_projects
7RUN /bin/bash -c 'PKG="$(command -v dnf || command -v yum)"; \ 7RUN /bin/bash -c 'PKG="$(command -v dnf || command -v yum)"; \
8 PKG_MGR="$(echo ${PKG:(-3)})"; \ 8 PKG_MGR="$(echo ${PKG:(-3)})"; \
9 if [ $PKG_MGR == "dnf" ]; then $PKG install python3-pip; PIP=pip3; else $PKG install python-pip; \ 9 if [ $PKG_MGR == "dnf" ]; then $PKG install -y python3-pip; PIP=pip3; else $PKG install -y python-pip; \
10 PIP=pip; fi; \ 10 PIP=pip; fi; \
11 cd /; \ 11 cd /; \
12 for X in $(ls /root/refspec_projects/*.tar.gz); do $PIP install $X; done; \ 12 for X in $(ls /root/refspec_projects/*.tar.gz); do $PIP install $X; done; \