Skip to content

Commit e4e80d2

Browse files
committed
add back contrail-docs to base container
Change-Id: I543ec6b551ab082b5c50e086353b6cfb66800665
1 parent 5231577 commit e4e80d2

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

containers/analytics/collector/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ LABEL name=$CONTAINER_NAME \
1313

1414
COPY entrypoint.sh /
1515

16-
RUN sed -e '/^tsflags=nodocs/d' -i /etc/yum.conf ; \
17-
yum install -y contrail-analytics ; \
16+
RUN yum install -y contrail-analytics ; \
1817
yum clean all -y ; \
1918
rm -rf /var/cache/yum
2019

containers/analytics/query-engine/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ LABEL name=$CONTAINER_NAME \
1515

1616
COPY entrypoint.sh /
1717

18-
RUN sed -e '/^tsflags=nodocs/d' -i /etc/yum.conf ; \
19-
yum install -y contrail-analytics ; \
18+
RUN yum install -y contrail-analytics ; \
2019
yum clean all -y ; \
2120
rm -rf /var/cache/yum
2221

containers/analytics/snmp/base/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ ENV NODE_TYPE=analytics-snmp
66
LABEL $VENDOR_DOMAIN".pod"=$NODE_TYPE
77

88
# 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 ; \
1110
yum clean all -y ; \
1211
rm -rf /var/cache/yum
1312

containers/base/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ARG PIP_REPOSITORY
99
# note: ldconfig looks strange. contrail-lib installs shared libraries but do not call it...
1010
# WARNING! all pip deps must be installed with pinned version to avoid breakages when pypi is upgraded.
1111
RUN \
12+
sed -e '/^tsflags=nodocs/d' -i /etc/yum.conf ; \
1213
BASE_EXTRA_RPMS=$(echo $BASE_EXTRA_RPMS | tr -d '"' | tr ',' ' ') ; \
1314
if [[ -n "$BASE_EXTRA_RPMS" ]] ; then \
1415
echo "INFO: contrail-base: install $BASE_EXTRA_RPMS" ; \
@@ -17,7 +18,7 @@ RUN \
1718
[ -d /etc/pki/rpm-gpg ] && rpm --import /etc/pki/rpm-gpg/* ; \
1819
fi ; \
1920
# 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 ; \
2122
# NOTE: utils must be placed into /opt/contrail/utils
2223
# TODO: rework utils with extra_scripts in setup.py
2324
python3 -m pip install --no-compile --extra-index-url $PIP_REPOSITORY "contrail_config_utils==0.1.dev0" ; \

0 commit comments

Comments
 (0)