Skip to content

Commit

Permalink
* Move python3-build requirement from everest-core/build-kit-everest-…
Browse files Browse the repository at this point in the history
…core to everest-ci/build-env-base

* Move documentation related build tools from everest/build-env-everest to everest-ci/build-env-base
* Remove documentation related build tools from everest-ci/dev-env-base, since they are included in everest-ci/build-env-base

Signed-off-by: Andreas Heinrich <[email protected]>
  • Loading branch information
andistorm committed Jul 29, 2024
1 parent 7e1baab commit 98279cd
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 16 deletions.
19 changes: 12 additions & 7 deletions docker/images/build-env-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,24 @@ RUN apt update \
# required by packet sniffer module
pkg-config=1.8.1-1 \
libpcap-dev=1.10.3-1 \
libcap-dev=1:2.66-4

# Install Python packages
RUN apt update \
&& apt install --no-install-recommends -y \
python3-venv=3.11.2-1+b1
libcap-dev=1:2.66-4 \
# Install Python packages
# Install Python packages - general
python3-venv=3.11.2-1+b1 \
# Install Python packages - required by everest-core to run integration tests
python3-build=0.9.0-1 \
# Install Python packages- required to build documentation
python3-sphinx=5.3.0-4

RUN apt clean \
&& rm -rf /var/lib/apt/lists/*

# Install additional Python packages
RUN python3 -m pip install --break-system-packages \
gcovr==7.2
gcovr==7.2 \
#Required by documentation - Sphinx extensions
sphinxcontrib-contentui==0.2.5 \
sphinxcontrib-svg2pdfconverter==1.2.2

# Install EVerest dependency manager
ARG EDM_VERSION=v0.6.2
Expand Down
9 changes: 0 additions & 9 deletions docker/images/dev-env-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,6 @@ RUN apt update \
&& echo ${USERNAME} ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/${USERNAME} \
&& chmod 0440 /etc/sudoers.d/${USERNAME}

# Additional Build Tools
# Additional Build Tool - Documentation
RUN apt update && apt install --no-install-recommends -y \
python3-sphinx=5.3.0-4
RUN python3 -m pip install --break-system-packages \
# Sphinx extensions
sphinxcontrib-contentui==0.2.5 \
sphinxcontrib-svg2pdfconverter==1.2.2

# Development Tools
# Development Tools - General
RUN apt update \
Expand Down

0 comments on commit 98279cd

Please sign in to comment.