From 56c79bc1ed3c8c31c018ba2112d7b5934cd17900 Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Tue, 30 Jan 2024 13:30:02 +0200 Subject: [PATCH 1/3] test deployment directo vat rate --- Dockerfile | 28 ++++++++++++++-------------- Gemfile | 2 +- Gemfile.lock | 11 ++++++++--- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 77114d0..bfaa914 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,24 +57,24 @@ 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 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/Gemfile b/Gemfile index 0658de3..594ee07 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem 'pdfkit' gem 'money' gem 'countries', :require => 'countries/global' gem 'e_invoice', github: 'internetee/e_invoice', branch: :master -gem 'directo', github: 'internetee/directo', branch: 'master' +gem 'directo', github: 'internetee/directo', branch: 'change-directo-code' gem 'lhv', github: 'internetee/lhv', branch: 'master' gem 'strong_migrations' gem 'figaro' diff --git a/Gemfile.lock b/Gemfile.lock index 3a83182..3b20b1b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/internetee/directo.git - revision: a5e0269919b210a9c6c59065648cc5a221166c4c - branch: master + revision: c886fccb9ca2e5f481124f07e65613a5b64cab74 + branch: change-directo-code specs: - directo (1.0.2) + directo (1.0.1) money (~> 6.13) nokogiri (~> 1.10) @@ -271,6 +271,7 @@ GEM marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.5) + mini_portile2 (2.8.5) minitest (5.20.0) money (6.16.0) i18n (>= 0.6.4, <= 2) @@ -288,6 +289,9 @@ GEM net-protocol net-ssh (7.2.0) nio4r (2.7.0) + nokogiri (1.15.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogiri (1.15.4-x86_64-linux) racc (~> 1.4) nori (2.6.0) @@ -503,6 +507,7 @@ GEM zeitwerk (2.6.12) PLATFORMS + ruby x86_64-linux DEPENDENCIES From d6304b5cf8f74fdfcdd3c596bfbd8bf4a18ebad8 Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Tue, 30 Jan 2024 14:36:25 +0200 Subject: [PATCH 2/3] updated version --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 594ee07..ca490a0 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem 'pdfkit' gem 'money' gem 'countries', :require => 'countries/global' gem 'e_invoice', github: 'internetee/e_invoice', branch: :master -gem 'directo', github: 'internetee/directo', branch: 'change-directo-code' +gem 'directo', github: 'internetee/directo', branch: :master gem 'lhv', github: 'internetee/lhv', branch: 'master' gem 'strong_migrations' gem 'figaro' diff --git a/Gemfile.lock b/Gemfile.lock index 3b20b1b..6c0b090 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/internetee/directo.git - revision: c886fccb9ca2e5f481124f07e65613a5b64cab74 - branch: change-directo-code + revision: 41c53f13f40c826c5c295b2988cc9484d918ab9e + branch: master specs: - directo (1.0.1) + directo (1.1.1) money (~> 6.13) nokogiri (~> 1.10) From d53b782e4dfbc81ae819d3d13312a2693a7218d4 Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Tue, 30 Jan 2024 14:41:40 +0200 Subject: [PATCH 3/3] updated puma --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6c0b090..d2dcd94 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -326,7 +326,7 @@ GEM activerecord (>= 5.2) activesupport (>= 5.2) public_suffix (5.0.3) - puma (6.4.0) + puma (6.4.2) nio4r (~> 2.0) racc (1.7.2) rack (2.2.8)