Skip to content

Commit d2cd4fa

Browse files
committed
update + fix
1 parent 620fffc commit d2cd4fa

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

cpp-cicd/Dockerfile

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,20 @@ LABEL youtube="https://www.youtube.com/channel/UCCCv8Glpb2dq2mhUj5mcHCQ"
1010
LABEL linkedin="https://www.linkedin.com/company/one-off-coder"
1111

1212
ENV NJOBS=8
13+
ENV CONDA_HOME=/root/anaconda3
14+
ENV PATH=${CONDA_HOME}/bin:${PATH}
1315

16+
# ubuntu
1417
RUN apt-get update -y \
1518
&& apt-get upgrade -y \
16-
&& apt-get -y install build-essential cmake libboost-all-dev gcc clang gdb libblkid-dev e2fslibs-dev libaudit-dev valgrind ninja-build doxygen graphviz mscgen dia lcov
19+
&& apt-get -y install build-essential cmake libboost-all-dev gcc clang gdb libblkid-dev e2fslibs-dev libaudit-dev valgrind ninja-build doxygen graphviz mscgen dia lcov wget
20+
21+
# anaconda
22+
RUN wget -q https://repo.anaconda.com/archive/Anaconda3-2020.02-Linux-x86_64.sh -O /tmp/anaconda.sh \
23+
&& /bin/bash /tmp/anaconda.sh -b -p $CONDA_HOME \
24+
&& conda update --all \
25+
&& conda install -y sphinx sphinx_rtd_theme breathe -c conda-forge \
26+
&& pip install sphinx-sitemap
1727

1828
RUN mkdir /project
1929
WORKDIR /project

cpp-cicd/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
ORGANIZATION=oneoffcoder
44
REPOSITORY=cpp-cicd
5-
VERSION=0.0.3
5+
VERSION=0.0.4
66
IMAGEID=cpp-cicd:local
77

88
docker tag ${IMAGEID} ${ORGANIZATION}/${REPOSITORY}:${VERSION}

cpp-cicd/scripts/build-project.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ make clean
77
make -j $NJOBS
88
make ccov-all -j $NJOBS
99
ctest -T memcheck -j $NJOBS
10-
make doc
10+
make Doxygen Sphinx

0 commit comments

Comments
 (0)