From 3ee65d19dfe708389e41bdcb49ce602371eae36a Mon Sep 17 00:00:00 2001
From: leca <leca@foxarmy.org>
Date: Tue, 3 Sep 2024 18:54:53 +0300
Subject: [PATCH] Starting work on docker images, added curl to linking

---
 CMakeLists.txt              |  1 +
 Docker/archlinux/Dockerfile | 39 +++++++++++++++++++++++++++++++++++++
 Docker/debian/Dockerfile    | 34 ++++++++++++++++++++++++++++++++
 image/checkimage.cpp        |  2 +-
 mainwindow.ui               |  2 +-
 5 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 Docker/archlinux/Dockerfile
 create mode 100644 Docker/debian/Dockerfile

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bcae8c1..8b446c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,5 +92,6 @@ find_package(PkgConfig REQUIRED)
 pkg_search_module(opencv REQUIRED IMPORTED_TARGET opencv)
 target_link_libraries(checks-parser PRIVATE PkgConfig::opencv)
 target_link_libraries(checks-parser PRIVATE -ltesseract)
+target_link_libraries(checks-parser PRIVATE -lcurl)
 
 
diff --git a/Docker/archlinux/Dockerfile b/Docker/archlinux/Dockerfile
new file mode 100644
index 0000000..ccb3345
--- /dev/null
+++ b/Docker/archlinux/Dockerfile
@@ -0,0 +1,39 @@
+FROM archlinux
+
+#Update
+RUN pacman --noconfirm -Sy
+
+#Build dependencies
+RUN pacman --noconfirm -S sudo cmake git coreutils base-devel eigen
+
+#Dependencies from repos
+RUN pacman --noconfirm -S qt5-base mbedtls
+
+RUN echo "MAKEFLAGS=\"-j${nproc}\"" >> /etc/makepkg.conf
+
+RUN useradd -ms /bin/bash checks-parser
+RUN usermod -a -G wheel checks-parser
+
+RUN echo "checks-parser ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+USER checks-parser
+WORKDIR /home/checks-parser
+
+#Dependencies from sources
+RUN git clone https://aur.archlinux.org/yay.git && \
+    cd yay && \
+    makepkg -si --noconfirm && \
+    cd .. && sudo rm -rf yay
+
+RUN yay -Sy --noconfirm gtkglext
+RUN yay -S --noconfirm cpr opencv2 nlohmann-json tesseract tesseract-data-rus
+
+#building
+WORKDIR /home/checks-parser
+RUN git clone https://git.foxarmy.org/leca/checks-parser && \
+    cd checks-parser && \
+    mkdir build && cd build && \
+    cmake .. && \
+    make -j ${nproc} && \
+    sudo make install
+
+ENTRYPOINT ["checks-parser"]
diff --git a/Docker/debian/Dockerfile b/Docker/debian/Dockerfile
new file mode 100644
index 0000000..6a3586f
--- /dev/null
+++ b/Docker/debian/Dockerfile
@@ -0,0 +1,34 @@
+FROM debian:bullseye
+
+#Update
+RUN apt update -y && apt upgrade -y
+
+#Build dependencies
+RUN apt install -y git build-essential cmake 
+
+#Dependencies from repos (qt5, openssl, tesseract and lang package)
+RUN apt install -y qtbase5-dev openssl libmbedtls-dev tesseract-ocr tesseract-ocr-rus libopencv-dev
+
+#Dependencies from sources 
+#cpr
+WORKDIR /root
+RUN git clone https://github.com/whoshuu/cpr.git && \
+    cd cpr && \
+    mkdir build && cd build && \
+    cmake .. && \
+    make -j ${nproc} && \
+    make install && \
+    cd /root && rm -rf cpr
+
+
+#building
+
+WORKDIR /root
+RUN git clone https://git.foxarmy.org/leca/checks-parser && \
+    cd checks-parser && \
+    mkdir build && cd build &&\
+    cmake .. && \
+    make -j ${nproc} && \
+    make install && \
+    
+ENTRYPOINT ["checks-parser"]
diff --git a/image/checkimage.cpp b/image/checkimage.cpp
index caddf3d..5a6f5f2 100644
--- a/image/checkimage.cpp
+++ b/image/checkimage.cpp
@@ -1,7 +1,7 @@
 #include <string>
 #include <tesseract/baseapi.h>
 #include <leptonica/allheaders.h>
-#include <opencv2/opencv.hpp>
+#include <opencv4/opencv2/opencv.hpp>
 #include "checkimage.h"
 
 CheckImage::CheckImage(std::string path) {
diff --git a/mainwindow.ui b/mainwindow.ui
index c977265..c20959d 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -80,7 +80,7 @@
      </rect>
     </property>
     <property name="currentIndex">
-     <number>1</number>
+     <number>0</number>
     </property>
     <widget class="QWidget" name="page_5">
      <widget class="QLabel" name="checkContentLabel">