From 4609dacc5f2ffa54012eaffc60196488a6c589b6 Mon Sep 17 00:00:00 2001 From: Eric MacDonald Date: Mon, 20 Jan 2020 11:34:07 -0500 Subject: [PATCH] Fix rvmc container build The current rvmc container build has a conflict over the python3-pip install. The CentOS repo has a prior version of python3-pip that requires python3 3.6 but the CENGN repo requires 3.7 due to the Titanium base image. The issue is resolved by updating this dockerfile with an older verison of python3-pip. Also, Since python3-pip provides pip3 the explicit pip3 install is no longer required. Change-Id: Ic0cf0d070eaa8f437a043ac52dfa7ecf0e42f957 Story: 2006980 Task: 37775 Signed-off-by: Eric MacDonald --- tools/rvmc/centos/docker/Dockerfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/rvmc/centos/docker/Dockerfile b/tools/rvmc/centos/docker/Dockerfile index 602a19a2..5cdcb9ec 100644 --- a/tools/rvmc/centos/docker/Dockerfile +++ b/tools/rvmc/centos/docker/Dockerfile @@ -1,16 +1,10 @@ ARG BASE FROM ${BASE} MAINTAINER eric.macdonald@windriver.com -RUN yum install -y iproute python3 pip3 datetime time +RUN yum install -y iproute python3-pip-9.0.3-5.el7 datetime time RUN pip3 install pyyaml redfish COPY rvmc.py /usr/local/bin ENV debug=0 ENV target=None ENTRYPOINT /usr/local/bin/rvmc.py --target $target --debug $debug -# Execution Examples: -# -# sudo docker run -v /etc/rvmc.yaml:/etc/rvmc.yaml rvmc:latest -# sudo docker run -v /etc/rvmc.yaml:/etc/rvmc.yaml --env target=dcloud1 rvmc:latest -# sudo docker run -v /etc/rvmc.yaml:/etc/rvmc.yaml --env target=dcloud1,dcloud2 rvmc:latest -# sudo docker run -v /etc/rvmc.yaml:/etc/rvmc.yaml --env target=dcloud1,dcloud2 --env debug=1 rvmc:latest \ No newline at end of file