From af888133ae15a571a4eee858156373842f79162c Mon Sep 17 00:00:00 2001
From: oleghasjanov <oleg.phenomenon@gmail.com>
Date: Mon, 7 Oct 2024 12:27:08 +0300
Subject: [PATCH] main changes

---
 .DS_Store                  | Bin 10244 -> 10244 bytes
 .github/workflows/ruby.yml |   6 +++---
 .ruby-version              |   2 +-
 Dockerfile                 |  32 +++++++++++++-------------------
 Dockerfile.staging         |   2 +-
 Gemfile                    |   2 +-
 Gemfile.lock               |   2 +-
 db/schema.rb               |   2 +-
 8 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index e6d0fe0f89cfff728dcf94cdc0251db84507965f..b15a4db512766c53ac354f69e0e2eb9bbc6e75cd 100644
GIT binary patch
delta 157
zcmZn(XbG6$&*-)>U^hRb+h!ht(;W583?&S?3<WvqhQZ1CxdjYBz&Ii1IFN$M<mS7$
zB<18M0Yy0W$<_Y7dF`kpvTO<-*@6s&sZ6S1!`T?h7*ZMX7*ZJW8H#e!H$Riu$hMhX
H;V(M?3F$1S

delta 36
scmZn(XbG6$&*-!<U^hRb(`Ful(;So2C3!c8NN#4ESWvK;UEwb~0PGD6!vFvP

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 2e0af5d..7c6d83e 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -8,7 +8,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2.0
+          ruby-version: 3.2.2
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - name: config bundler
         run:  |
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2.0
+          ruby-version: 3.2.2
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - name: config bundler
         run:  |
@@ -49,7 +49,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04]
-        ruby: [ '3.2.0' ]
+        ruby: [ '3.2.2' ]
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
     
diff --git a/.ruby-version b/.ruby-version
index 944880f..acf9bf0 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.2.0
+3.2.2
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index bfaa914..073547b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,12 @@
-
-FROM ruby:3.2.0-slim-buster
+FROM internetee/ruby:3.2.2-bullseye
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
+
 RUN apt-get update > /dev/null && apt-get install -y --no-install-recommends > /dev/null \
     build-essential=* \
+    imagemagick=* \
     curl \
     wget \
     gnupg2 \
@@ -29,7 +32,7 @@ RUN apt-get update > /dev/null && apt-get install -y --no-install-recommends > /
     && rm -rf /var/lib/apt/lists/*
 
 # add repository for Node.js in the LTS version
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
 
 RUN apt-get install -y --no-install-recommends > /dev/null \
   nodejs=* \
@@ -57,24 +60,15 @@ RUN apt-get install -y --no-install-recommends > /dev/null \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
-# RUN curl https://chromedriver.storage.googleapis.com/2.46/chromedriver_linux64.zip -o /chromedriver_linux64.zip
-# RUN apt-get update > /dev/null \
-#     && apt-get install -yf --no-install-recommends > /dev/null unzip=* \
-#     && apt-get clean \
-#     && rm -rf /var/lib/apt/lists/*
-# RUN unzip chromedriver_linux64.zip -d /usr/local/bin
-# RUN rm /chromedriver_linux64.zip
-
-# RUN npm install --global yarn
 RUN npm install -g yarn@latest
 
-# RUN curl https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -o /chrome.deb
-# RUN dpkg -i /chrome.deb || apt-get update > /dev/null \
-#     && apt-get install -yf --no-install-recommends > /dev/null && apt-get clean \
-#     && rm -rf /var/lib/apt/lists/*
-# RUN dpkg -i /chrome.deb
-# RUN rm /chrome.deb
-# RUN sed -i 's/SECLEVEL=2/SECLEVEL=1/' /etc/ssl/openssl.cnf
+RUN curl https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -o /chrome.deb
+RUN dpkg -i /chrome.deb || apt-get update > /dev/null \
+    && apt-get install -yf --no-install-recommends > /dev/null && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+RUN dpkg -i /chrome.deb
+RUN rm /chrome.deb
+RUN sed -i 's/SECLEVEL=2/SECLEVEL=1/' /etc/ssl/openssl.cnf
 
 RUN mkdir -p /opt/webapps/app/tmp/pids
 WORKDIR /opt/webapps/app
diff --git a/Dockerfile.staging b/Dockerfile.staging
index 529ca43..3d67086 100644
--- a/Dockerfile.staging
+++ b/Dockerfile.staging
@@ -17,7 +17,7 @@
 # EXPOSE 3000
 
 
-FROM ruby:3.2.0-slim-buster
+FROM ruby:3.2.2-slim-buster
 
 ARG RAILS_ENV
 ARG SECRET_KEY_BASE
diff --git a/Gemfile b/Gemfile
index f04eef1..5bb08cd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '3.2.0'
+ruby '3.2.2'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
 gem 'rails', '~> 7.1.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index f909b9c..b0c2d71 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -607,7 +607,7 @@ DEPENDENCIES
   wkhtmltopdf-binary
 
 RUBY VERSION
-   ruby 3.2.0p0
+   ruby 3.2.2p0
 
 BUNDLED WITH
    2.4.13
diff --git a/db/schema.rb b/db/schema.rb
index d929856..ff3262d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_10_31_100825) do
+ActiveRecord::Schema[7.1].define(version: 2023_11_30_114315) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"