aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGalanakis, Minos <minos.galanakis@arm.com>2019-07-25 09:35:30 +0100
committerGalanakis, Minos <minos.galanakis@arm.com>2019-07-25 12:05:22 +0100
commitbb3fae25126a1cd1e06dcc2571959c2e999ac71a (patch)
treec2c2159de4ddfdf4b3362975a92dfe6547482474
parentda89c98483cdd91286ab3f9cd90a24d69f7ef87d (diff)
downloaddockerfiles-bb3fae25126a1cd1e06dcc2571959c2e999ac71a.tar.gz
Updated xenial-amd64-tf-m-build dockerfile
This patch adds the following dependencies to the tf-m docker build image: * graphviz * doxygen * git-lfs * java runtime environemnt * plantuml * Sphinx Change-Id: I2b1003c31061e33b84d9fb0e2b2b2b7d2540a13d Signed-off-by: Galanakis, Minos <minos.galanakis@arm.com>
-rw-r--r--xenial-amd64-tf-m-build/Dockerfile16
-rw-r--r--xenial-amd64-tf-m-build/requirements_python3.txt5
2 files changed, 21 insertions, 0 deletions
diff --git a/xenial-amd64-tf-m-build/Dockerfile b/xenial-amd64-tf-m-build/Dockerfile
index 59e933e..b7b70fa 100644
--- a/xenial-amd64-tf-m-build/Dockerfile
+++ b/xenial-amd64-tf-m-build/Dockerfile
@@ -8,7 +8,11 @@ RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
build-essential \
curl \
+ default-jre \
+ doxygen \
git \
+ graphviz \
+ jq \
openjdk-8-jdk \
openssh-server \
perl \
@@ -16,11 +20,13 @@ RUN apt-get update \
python-dev \
python-pip \
python-psutil \
+ python3 \
python3-crypto \
python3-pip \
python3-psutil \
python3-pyasn1 \
python3-setuptools \
+ python3-wheel \
srecord \
sudo \
tree \
@@ -28,6 +34,11 @@ RUN apt-get update \
virtualenv \
wget \
zip \
+ && curl -s \
+ https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh \
+ | sudo bash \
+ && apt-get update \
+ && apt-get install -y git-lfs \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -60,6 +71,11 @@ ENV PATH=/home/buildslave/tools/bin:${PATH}
USER root
+RUN mkdir /usr/share/plantuml && \
+ curl -L 'https://repo1.maven.org/maven2/net/sourceforge/plantuml/plantuml/1.2019.6/plantuml-1.2019.6.jar' \
+ -o /usr/share/plantuml/plantuml.jar
+ENV PLANTUML_JAR_PATH=/usr/share/plantuml/plantuml.jar
+
ARG VERSION=3.28
RUN curl --create-dirs -fsSLo /usr/share/jenkins/slave.jar https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/${VERSION}/remoting-${VERSION}.jar \
&& chmod 755 /usr/share/jenkins \
diff --git a/xenial-amd64-tf-m-build/requirements_python3.txt b/xenial-amd64-tf-m-build/requirements_python3.txt
index c3653a2..3ed3c50 100644
--- a/xenial-amd64-tf-m-build/requirements_python3.txt
+++ b/xenial-amd64-tf-m-build/requirements_python3.txt
@@ -3,3 +3,8 @@ MarkupSafe==1.0
PyYAML==3.12
pycryptodome==3.6.6
pyasn1==0.1.9
+m2r==0.2.1
+Sphinx==2.0.1
+sphinx-rtd-theme==0.4.3
+sphinxcontrib-plantuml==0.15
+xmltodict==0.12.0