File tree 4 files changed +5
-7
lines changed
4 files changed +5
-7
lines changed Original file line number Diff line number Diff line change @@ -13,8 +13,7 @@ LABEL name=$CONTAINER_NAME \
13
13
14
14
COPY entrypoint.sh /
15
15
16
- RUN sed -e '/^tsflags=nodocs/d' -i /etc/yum.conf ; \
17
- yum install -y contrail-analytics ; \
16
+ RUN yum install -y contrail-analytics ; \
18
17
yum clean all -y ; \
19
18
rm -rf /var/cache/yum
20
19
Original file line number Diff line number Diff line change @@ -15,8 +15,7 @@ LABEL name=$CONTAINER_NAME \
15
15
16
16
COPY entrypoint.sh /
17
17
18
- RUN sed -e '/^tsflags=nodocs/d' -i /etc/yum.conf ; \
19
- yum install -y contrail-analytics ; \
18
+ RUN yum install -y contrail-analytics ; \
20
19
yum clean all -y ; \
21
20
rm -rf /var/cache/yum
22
21
Original file line number Diff line number Diff line change @@ -6,8 +6,7 @@ ENV NODE_TYPE=analytics-snmp
6
6
LABEL $VENDOR_DOMAIN".pod" =$NODE_TYPE
7
7
8
8
# required to install python's snmp package
9
- RUN sed -e '/^tsflags=nodocs/d' -i /etc/yum.conf ; \
10
- yum install -y net-snmp-devel ; \
9
+ RUN yum install -y net-snmp-devel ; \
11
10
yum clean all -y ; \
12
11
rm -rf /var/cache/yum
13
12
Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ ARG PIP_REPOSITORY
9
9
# note: ldconfig looks strange. contrail-lib installs shared libraries but do not call it...
10
10
# WARNING! all pip deps must be installed with pinned version to avoid breakages when pypi is upgraded.
11
11
RUN \
12
+ sed -e '/^tsflags=nodocs/d' -i /etc/yum.conf ; \
12
13
BASE_EXTRA_RPMS=$(echo $BASE_EXTRA_RPMS | tr -d '"' | tr ',' ' ' ) ; \
13
14
if [[ -n "$BASE_EXTRA_RPMS" ]] ; then \
14
15
echo "INFO: contrail-base: install $BASE_EXTRA_RPMS" ; \
17
18
[ -d /etc/pki/rpm-gpg ] && rpm --import /etc/pki/rpm-gpg/* ; \
18
19
fi ; \
19
20
# net-tools has netstat which is used by tf-test inside kubemanager container
20
- yum install -y nc gcc python3-devel contrail-lib net-tools ; \
21
+ yum install -y nc gcc python3-devel contrail-lib contrail-docs net-tools ; \
21
22
# NOTE: utils must be placed into /opt/contrail/utils
22
23
# TODO: rework utils with extra_scripts in setup.py
23
24
python3 -m pip install --no-compile --extra-index-url $PIP_REPOSITORY "contrail_config_utils==0.1.dev0" ; \
You can’t perform that action at this time.
0 commit comments