summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Dockerfile5
-rw-r--r--Dockerfile_test8
2 files changed, 6 insertions, 7 deletions
diff --git a/Dockerfile b/Dockerfile
index 5bcf6c7..3664680 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,9 @@
-FROM debian:buster
+FROM debian:latest
MAINTAINER Oleg Morozenkov <m@oleg.rocks>
RUN apt-get -qq update && \
- apt-get -qq install -y g++ make binutils cmake libssl-dev libboost-system-dev libcurl4-openssl-dev zlib1g-dev
+ apt-get -qq install -y g++ make binutils cmake libssl-dev libboost-system-dev libcurl4-openssl-dev zlib1g-dev && \
+ rm -rf /var/lib/apt/lists/*
WORKDIR /usr/src/tgbot-cpp
COPY include include
diff --git a/Dockerfile_test b/Dockerfile_test
index 9e37736..7254706 100644
--- a/Dockerfile_test
+++ b/Dockerfile_test
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:latest
MAINTAINER Oleg Morozenkov <m@oleg.rocks>
RUN apt-get -qq update && \
@@ -16,8 +16,8 @@ RUN apt-get -qq update && \
make \
python-dev \
wget \
- zlib1g-dev
-
+ zlib1g-dev && \
+ rm -rf /var/lib/apt/lists/*
WORKDIR /usr/src/tgbot-cpp
COPY include include
@@ -29,7 +29,6 @@ RUN cmake -DENABLE_TESTS=ON . && \
make -j$(nproc) && \
make install
-
COPY samples samples
WORKDIR /usr/src/tgbot-cpp/samples/echobot
@@ -49,7 +48,6 @@ RUN rm -rf samples/echobot-submodule/tgbot-cpp/
COPY include samples/echobot-submodule/tgbot-cpp/include
COPY src samples/echobot-submodule/tgbot-cpp/src
COPY CMakeLists.txt samples/echobot-submodule/tgbot-cpp/
-
WORKDIR /usr/src/tgbot-cpp/samples/echobot-submodule
RUN rm -rf CMakeCache.txt CMakeFiles/ && \
cmake . && make -j$(nproc)