Skip to content

Commit 098c538

Browse files
authored
Merge pull request #24 from pjonsson/dockerfile-comments
Dockerfile: move cmake to build container
2 parents 12a71ac + fdfeb8d commit 098c538

1 file changed

Lines changed: 6 additions & 13 deletions

File tree

Dockerfile

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,13 @@ export DEBIAN_FRONTEND=noninteractive && \
2525
apt-get -y update && apt-get -y upgrade && \
2626
# Install required tools.
2727
apt-get -y install --no-install-recommends \
28-
# might not be necessary anymore? not sure why they are here
29-
#ca-certificates \
30-
#dirmngr \
31-
#gpg \
32-
# clone/install from git repositories
33-
# might not be necessary anymore
34-
#git \
35-
# speed up building, likely only effective for local builds
28+
# speed up building, only effective for local builds
3629
ccache \
3730
# GCC compiler etc.
3831
build-essential \
39-
# build requirement for OpenCV
40-
cmake \
41-
# build requirement for OpenCV
32+
# build requirement for OpenCV/FORCE
4233
pkgconf \
43-
# not sure
34+
# switching UID/GID inside container (for permissions)
4435
gosu \
4536
# Numerical library, dynamically linked in FORCE
4637
libgsl0-dev \
@@ -67,7 +58,7 @@ apt-get -y install --no-install-recommends \
6758
r-base \
6859
# used in all multiprocessing programs
6960
parallel \
70-
# wrap entrypoints calls
61+
# reaping of zombie processes
7162
tini
7263

7364
FROM internal_base AS opencv_builder
@@ -87,6 +78,8 @@ export DEBIAN_FRONTEND=noninteractive && \
8778
apt-get -y update && apt-get -y upgrade && \
8879
apt-get install -y --no-install-recommends \
8980
ccache \
81+
# build requirement for OpenCV
82+
cmake \
9083
ninja-build \
9184
python3-pip
9285

0 commit comments

Comments
 (0)