From 70b02c460b55f6a6722a852704ee7d916c48ed47 Mon Sep 17 00:00:00 2001
From: llnulldisk <48621230+llnulldisk@users.noreply.github.com>
Date: Fri, 30 Sep 2022 17:46:58 +0200
Subject: Update docker files and CMakeLists

---
 Dockerfile_test | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'Dockerfile_test')

diff --git a/Dockerfile_test b/Dockerfile_test
index ad52a88..a209609 100644
--- a/Dockerfile_test
+++ b/Dockerfile_test
@@ -40,6 +40,14 @@ WORKDIR /usr/src/tgbot-cpp/samples/echobot-curl-client
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
 
+WORKDIR /usr/src/tgbot-cpp/samples/echobot-setmycommands
+RUN rm -rf CMakeCache.txt CMakeFiles/ && \
+    cmake . && make -j$(nproc)
+
+WORKDIR /usr/src/tgbot-cpp/samples/echobot-submodule
+RUN rm -rf CMakeCache.txt CMakeFiles/ && \
+    cmake . && make -j$(nproc)
+
 WORKDIR /usr/src/tgbot-cpp/samples/echobot-webhook-server
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
@@ -56,7 +64,10 @@ WORKDIR /usr/src/tgbot-cpp/samples/received-text-processing
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
 
+WORKDIR /usr/src/tgbot-cpp/samples/reply-keyboard
+RUN rm -rf CMakeCache.txt CMakeFiles/ && \
+    cmake . && make -j$(nproc)
+
 WORKDIR /usr/src/tgbot-cpp
 ENV CTEST_OUTPUT_ON_FAILURE=1
 CMD make test
-
-- 
cgit v1.2.3


From a5cba44bee66ec784efb774fa4b85a787b9603e6 Mon Sep 17 00:00:00 2001
From: llnulldisk <48621230+llnulldisk@users.noreply.github.com>
Date: Fri, 30 Sep 2022 19:21:28 +0200
Subject: Update samples

---
 Dockerfile_test | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Dockerfile_test')

diff --git a/Dockerfile_test b/Dockerfile_test
index a209609..efd24cd 100644
--- a/Dockerfile_test
+++ b/Dockerfile_test
@@ -45,6 +45,8 @@ RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
 
 WORKDIR /usr/src/tgbot-cpp/samples/echobot-submodule
+RUN rm -rf tgbot-cpp/
+COPY ../../../ ./
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
 
-- 
cgit v1.2.3


From 243b0fa863fcd4d292689d58210f6d4ea2ee4d88 Mon Sep 17 00:00:00 2001
From: llnulldisk <48621230+llnulldisk@users.noreply.github.com>
Date: Fri, 30 Sep 2022 20:24:05 +0200
Subject: Update echobot-submodule

---
 Dockerfile_test | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Dockerfile_test')

diff --git a/Dockerfile_test b/Dockerfile_test
index efd24cd..ea208d8 100644
--- a/Dockerfile_test
+++ b/Dockerfile_test
@@ -46,7 +46,9 @@ RUN rm -rf CMakeCache.txt CMakeFiles/ && \
 
 WORKDIR /usr/src/tgbot-cpp/samples/echobot-submodule
 RUN rm -rf tgbot-cpp/
-COPY ../../../ ./
+COPY ../../include* tgbot-cpp/include/
+COPY ../../src* tgbot-cpp/src/
+COPY ../../CMakeLists.txt tgbot-cpp/CMakeLists.txt
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
 
-- 
cgit v1.2.3


From 19f577d35bd5684a368c63c6a40f5d16dbc11fac Mon Sep 17 00:00:00 2001
From: Nulldisk <48621230+llnulldisk@users.noreply.github.com>
Date: Fri, 30 Sep 2022 22:16:01 +0200
Subject: Update Dockerfile_test

---
 Dockerfile_test | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'Dockerfile_test')

diff --git a/Dockerfile_test b/Dockerfile_test
index ea208d8..6306115 100644
--- a/Dockerfile_test
+++ b/Dockerfile_test
@@ -44,11 +44,13 @@ WORKDIR /usr/src/tgbot-cpp/samples/echobot-setmycommands
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
 
+WORKDIR /usr/src/tgbot-cpp
+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 tgbot-cpp/
-COPY ../../include* tgbot-cpp/include/
-COPY ../../src* tgbot-cpp/src/
-COPY ../../CMakeLists.txt tgbot-cpp/CMakeLists.txt
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
 
-- 
cgit v1.2.3