From f931ae85c2308e47f282abb7839bbe9ebd651c77 Mon Sep 17 00:00:00 2001
From: Denis <denok629@gmail.com>
Date: Tue, 2 May 2023 20:45:53 +0300
Subject: [PATCH] upd ci

---
 .github/workflows/ci.yml |  4 +--
 Dockerfile               | 76 +++++++++++++++++++++++-----------------
 2 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index debe623..16503a9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ defaults:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: raiden454/sourced-out
+    container: raiden454/ddt-project
     steps:
       - uses: actions/checkout@v3
       - name: Building
@@ -27,7 +27,7 @@ jobs:
       #     ./build/tests/test_parser    
   linters:
     runs-on: ubuntu-latest
-    container: raiden454/sourced-out
+    container: raiden454/ddt-project
     steps:
       - uses: actions/checkout@v3
       - name: Cppcheck
diff --git a/Dockerfile b/Dockerfile
index 16fed7e..fd9957b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,34 +1,44 @@
-FROM ubuntu:20.04 AS base
-
-ENV TZ=Europe/Moscow
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-RUN apt update -y
-RUN apt install -y gcc
-RUN apt install -y libpqxx-dev 
-RUN apt install -y clang-tidy 
-RUN apt install -y python3-pip 
-RUN apt install -y cppcheck
-RUN apt install -y cmake
-RUN apt install -y git
-RUN apt-get update -y
-RUN apt install -y xvfb
-RUN pip install gcovr
-RUN pip install cpplint
-
-RUN apt-get install wget
-RUN wget https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.gz
-RUN tar xvf boost_1_82_0.tar.gz
-WORKDIR boost_1_82_0
-RUN ./bootstrap.sh --prefix=/usr/
-RUN ./b2 install
-
-RUN git clone https://github.com/google/googletest.git -b release-1.11.0
-WORKDIR googletest/build
-RUN cmake .. -DBUILD_GMOCK=OFF
-RUN make
-RUN make install
-
-WORKDIR /project
-
+FROM ubuntu:20.04 AS base 
+ 
+ENV TZ=Europe/Moscow 
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone 
+ 
+RUN apt update -y 
+RUN apt install -y gcc 
+RUN apt install -y libpqxx-dev  
+RUN apt install -y clang-tidy  
+RUN apt install -y nlohmann-json3-dev 
+RUN apt install -y python3-pip  
+RUN apt install -y cppcheck 
+RUN apt install -y git 
+RUN apt-get update -y 
+RUN apt install -y xvfb 
+RUN pip install gcovr 
+RUN pip install cpplint 
+ 
+RUN apt-get install wget 
+RUN apt-get install libssl-dev 
+ 
+RUN wget https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3.tar.gz 
+RUN tar -zxvf cmake-3.26.3.tar.gz 
+WORKDIR cmake-3.26.3 
+RUN ./bootstrap 
+RUN make  
+RUN make install 
+RUN cd .. 
+ 
+RUN wget https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.gz 
+RUN tar xvf boost_1_82_0.tar.gz 
+WORKDIR boost_1_82_0 
+RUN ./bootstrap.sh --prefix=/usr/ 
+RUN ./b2 install 
+ 
+RUN git clone https://github.com/google/googletest.git -b release-1.11.0 
+WORKDIR googletest/build 
+RUN cmake .. -DBUILD_GMOCK=OFF 
+RUN make 
+RUN make install 
+ 
+WORKDIR /project 
+ 
 COPY . .
\ No newline at end of file
-- 
GitLab