summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleg Morozenkov <o.morozenkov@corp.mail.ru>2023-01-26 10:34:29 +0300
committerOleg Morozenkov <o.morozenkov@corp.mail.ru>2023-01-26 10:34:29 +0300
commit1aa81588384359f1f96b0dff453374570439af72 (patch)
treea3eedee7d73d703d56f81e182abd8c5e4f2626fc
parent90dc11b7496864077cc81b4710673896147e2bfa (diff)
fix #254
-rw-r--r--Dockerfile_test4
-rw-r--r--samples/receive-file/CMakeLists.txt (renamed from samples/file/CMakeLists.txt)2
-rw-r--r--samples/receive-file/Dockerfile (renamed from samples/file/Dockerfile)4
-rw-r--r--samples/receive-file/src/main.cpp (renamed from samples/file/src/main.cpp)1
4 files changed, 7 insertions, 4 deletions
diff --git a/Dockerfile_test b/Dockerfile_test
index 6306115..9e37736 100644
--- a/Dockerfile_test
+++ b/Dockerfile_test
@@ -74,6 +74,10 @@ WORKDIR /usr/src/tgbot-cpp/samples/reply-keyboard
RUN rm -rf CMakeCache.txt CMakeFiles/ && \
cmake . && make -j$(nproc)
+WORKDIR /usr/src/tgbot-cpp/samples/receive-file
+RUN rm -rf CMakeCache.txt CMakeFiles/ && \
+ cmake . && make -j$(nproc)
+
WORKDIR /usr/src/tgbot-cpp
ENV CTEST_OUTPUT_ON_FAILURE=1
CMD make test
diff --git a/samples/file/CMakeLists.txt b/samples/receive-file/CMakeLists.txt
index 67b9b26..0031c89 100644
--- a/samples/file/CMakeLists.txt
+++ b/samples/receive-file/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.10.2)
-project(file)
+project(receive-file)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/samples/file/Dockerfile b/samples/receive-file/Dockerfile
index b87c2ca..ce91c8c 100644
--- a/samples/file/Dockerfile
+++ b/samples/receive-file/Dockerfile
@@ -1,8 +1,8 @@
FROM reo7sp/tgbot-cpp
MAINTAINER Oleg Morozenkov <m@oleg.rocks>
-WORKDIR /usr/src/photo
+WORKDIR /usr/src/receive-file
COPY . .
RUN cmake .
RUN make -j4
-CMD ./photo
+CMD ./receive-file
diff --git a/samples/file/src/main.cpp b/samples/receive-file/src/main.cpp
index f46b288..bbfaadf 100644
--- a/samples/file/src/main.cpp
+++ b/samples/receive-file/src/main.cpp
@@ -6,7 +6,6 @@
#include <tgbot/tgbot.h>
-
using namespace std;
using namespace TgBot;