aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2019-12-09 04:24:47 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2019-12-09 04:24:47 +0300
commit1704e8fc16fbbe36ab2967aa0d98e550b0c17e59 (patch)
tree4e4d36742e515ffcef1db8672461ffbd1254a8a1
parentAppVeyor/Travis: remove options also present in common.cmake (diff)
downloadmath-server-1704e8fc16fbbe36ab2967aa0d98e550b0c17e59.tar.gz
math-server-1704e8fc16fbbe36ab2967aa0d98e550b0c17e59.zip
Docker: no dist-upgrade in Dockerfile-s
Diffstat (limited to '')
-rw-r--r--client/Dockerfile11
-rw-r--r--server/Dockerfile11
2 files changed, 14 insertions, 8 deletions
diff --git a/client/Dockerfile b/client/Dockerfile
index b60e96b..96da607 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -8,9 +8,13 @@ LABEL maintainer="Egor Tensin <Egor.Tensin@gmail.com>"
# Don't prompt:
ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update -yq && apt-get dist-upgrade -yq
-
-RUN apt-get install -yq build-essential cmake libboost-filesystem-dev libboost-program-options-dev libboost-test-dev
+RUN apt-get update -yq && \
+ apt-get install -yq --no-install-recommmends \
+ build-essential \
+ cmake \
+ libboost-filesystem-dev \
+ libboost-program-options-dev \
+ libboost-test-dev
COPY [".", "/tmp/src/"]
@@ -19,7 +23,6 @@ WORKDIR /tmp/build
RUN cmake -G "Unix Makefiles" \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D ENABLE_TESTS=ON \
- -D USE_STATIC_RUNTIME=OFF \
-D CMAKE_CXX_STANDARD_LIBRARIES="-lpthread" \
/tmp/src && \
cmake --build test && \
diff --git a/server/Dockerfile b/server/Dockerfile
index 518a99f..7169a50 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -8,9 +8,13 @@ LABEL maintainer="Egor Tensin <Egor.Tensin@gmail.com>"
# Don't prompt:
ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update -yq && apt-get dist-upgrade -yq
-
-RUN apt-get install -yq build-essential cmake libboost-filesystem-dev libboost-program-options-dev libboost-test-dev
+RUN apt-get update -yq && \
+ apt-get install -yq --no-install-recommends \
+ build-essential \
+ cmake \
+ libboost-filesystem-dev \
+ libboost-program-options-dev \
+ libboost-test-dev
COPY [".", "/tmp/src/"]
@@ -19,7 +23,6 @@ WORKDIR /tmp/build
RUN cmake -G "Unix Makefiles" \
-D CMAKE_BUILD_TYPE=Release \
-D ENABLE_TESTS=ON \
- -D USE_STATIC_RUNTIME=OFF \
-D CMAKE_CXX_STANDARD_LIBRARIES="-lpthread" \
/tmp/src && \
cmake --build test && \