You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by dg...@apache.org on 2019/04/06 00:15:23 UTC
[trafficcontrol] branch 3.0.x updated: 3.0.x docs build (#3471)
This is an automated email from the ASF dual-hosted git repository.
dgelinas pushed a commit to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/3.0.x by this push:
new d39d503 3.0.x docs build (#3471)
d39d503 is described below
commit d39d503ab307e33746b7f02bd4fac1659daf7eed
Author: Dan Kirkwood <da...@gmail.com>
AuthorDate: Fri Apr 5 18:15:17 2019 -0600
3.0.x docs build (#3471)
* Updated Python version in documentation builds (#3467)
(cherry picked from commit bba3d6fe14b5f7cd0b8f9f053addafe21283fa0b)
* split yum cmds/pip cmds in docs dockerfile (#3468)
(cherry picked from commit e01596085bf1007e96789c61300132d68955be57)
---
infrastructure/docker/build/Dockerfile-docs | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/infrastructure/docker/build/Dockerfile-docs b/infrastructure/docker/build/Dockerfile-docs
index 0728f43..96b1053 100644
--- a/infrastructure/docker/build/Dockerfile-docs
+++ b/infrastructure/docker/build/Dockerfile-docs
@@ -34,11 +34,12 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
### docs specific requirements
ADD docs/source/requirements.txt /docs.requirements.txt
RUN yum -y install \
- python34 \
- python34-pip \
+ python36 \
+ python36-pip \
+ python36-psutil \
make && \
- yum -y clean all && \
- python3 -m pip install --upgrade setuptools && \
+ yum -y clean all
+RUN python3 -m pip install --upgrade setuptools && \
python3 -m pip install -r /docs.requirements.txt
###