Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
Signed-off-by: Andreas Heinrich <[email protected]>
  • Loading branch information
andistorm committed Jul 15, 2024
1 parent 8c96804 commit b42e569
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 6 deletions.
8 changes: 7 additions & 1 deletion docker/images/build-env-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@ RUN apt update \
g++=4:12.2.0-3 \
# compiler tools
ccache=4.8+really4.7.5-1 \
lcov=1.16-1
lcov=1.16-1 \
clang-format-15=1:15.0.6-4+b1 \
clang-tidy-15=1:15.0.6-4+b1

# Create symlinks for clang-format and clang-tidy
RUN ln -s /usr/bin/clang-format-15 /usr/bin/clang-format \
&& ln -s /usr/bin/clang-tidy-15 /usr/bin/clang-tidy

# additional packages
RUN apt update \
Expand Down
22 changes: 17 additions & 5 deletions docker/images/dev-env-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,35 @@ 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 \
&& apt install --no-install-recommends -y \
wget=1.21.3-1+b2 \
doxygen=1.9.4-4 \
graphviz=2.42.2-7+b3 \
build-essential=12.9 \
clang-format-15=1:15.0.6-4+b1 \
clang-tidy-15=1:15.0.6-4+b1 \
cppcheck=2.10-2 \
bash-completion=1:2.11-6
# Development Tools - Documentation
RUN python3 -m pip install --break-system-packages \
# language server RST/Sphinx
esbonio==0.16.4 \
# Style checker for RST/Sphinx
doc8==1.1.1

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

RUN ln -s /usr/bin/clang-format-15 /usr/bin/clang-format \
&& ln -s /usr/bin/clang-tidy-15 /usr/bin/clang-tidy

USER ${USERNAME}

RUN mkdir ~/.ssh \
Expand Down

0 comments on commit b42e569

Please sign in to comment.