From 2ac32f8970759ea6a92b57a13bd70a6a23b3364e Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 8 May 2024 20:04:43 +0300 Subject: [PATCH] Bump ruby --- .github/workflows/shizoid.yml | 2 +- .ruby-version | 2 +- Dockerfile | 12 ++++++------ Gemfile | 2 +- Gemfile.lock | 16 ++++++++-------- config/deploy/Containerfile | 6 +++--- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/shizoid.yml b/.github/workflows/shizoid.yml index 100d4bf..a05219f 100644 --- a/.github/workflows/shizoid.yml +++ b/.github/workflows/shizoid.yml @@ -31,7 +31,7 @@ jobs: - name: 'Setup Ruby' uses: ruby/setup-ruby@v1 with: - ruby-version: 3.3.0 + ruby-version: 3.3.1 - name: "Install required system packages" run: sudo apt-get update -y && sudo apt-get install openssh-client rsync libpq-dev cmake -y - name: "Bundle install" diff --git a/.ruby-version b/.ruby-version index 15a2799..bea438e 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.0 +3.3.1 diff --git a/Dockerfile b/Dockerfile index e72f50e..21709bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,20 @@ -FROM ruby:3.3.0-alpine +FROM ruby:3.3.1-alpine EXPOSE 3000 WORKDIR /opt/app/src ENV LANG ru_RU.utf8 RUN apk add --no-cache --update git build-base ca-certificates less postgresql-dev postgresql-client tzdata make libffi-dev libxml2 libxml2-dev libxslt-dev && \ - cp /usr/share/zoneinfo/Europe/Moscow /etc/localtime && \ - echo "Europe/Moscow" > /etc/timezone + cp /usr/share/zoneinfo/Europe/Moscow /etc/localtime && \ + echo "Europe/Moscow" > /etc/timezone ARG CONTAINER_GID=1000 ARG CONTAINER_UID=1000 RUN addgroup -g ${CONTAINER_GID} app && \ - adduser --uid ${CONTAINER_UID} --disabled-password --ingroup app --home /opt/app app && \ - chown -R app:app /opt/app && \ - chmod -R 0775 /opt/app + adduser --uid ${CONTAINER_UID} --disabled-password --ingroup app --home /opt/app app && \ + chown -R app:app /opt/app && \ + chmod -R 0775 /opt/app USER app:app diff --git a/Gemfile b/Gemfile index 3bb4d6b..1143128 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '3.3.0' +ruby '3.3.1' gem 'faraday' gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index e34d4d6..e1e76a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -162,7 +162,7 @@ GEM guard (~> 2.0) rubocop (< 2.0) hashdiff (1.0.1) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) ice_nine (0.11.2) io-console (0.7.2) @@ -184,13 +184,13 @@ GEM net-pop net-smtp marcel (1.0.4) - method_source (1.0.0) + method_source (1.1.0) mini_mime (1.1.5) - mini_portile2 (2.8.5) + mini_portile2 (2.8.6) minitest (5.22.3) multipart-post (2.4.0) nenv (0.3.0) - net-imap (0.4.10) + net-imap (0.4.11) date net-protocol net-pop (0.1.2) @@ -199,8 +199,8 @@ GEM timeout net-smtp (0.5.0) net-protocol - nio4r (2.7.1) - nokogiri (1.16.3) + nio4r (2.7.3) + nokogiri (1.16.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) notiffany (0.1.3) @@ -253,7 +253,7 @@ GEM thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) - rake (13.1.0) + rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) @@ -415,7 +415,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 3.3.0p0 + ruby 3.3.1p55 BUNDLED WITH 2.5.5 diff --git a/config/deploy/Containerfile b/config/deploy/Containerfile index 0e07d5c..a2259a6 100644 --- a/config/deploy/Containerfile +++ b/config/deploy/Containerfile @@ -1,11 +1,11 @@ -FROM docker.io/ruby:3.3.0-alpine +FROM docker.io/ruby:3.3.1-alpine EXPOSE 3000 WORKDIR /opt/app/src ENV LANG ru_RU.utf8 RUN apk add --no-cache --update git build-base ca-certificates less postgresql-dev postgresql-client tzdata make libffi-dev libxml2 libxml2-dev libxslt-dev && \ - cp /usr/share/zoneinfo/Europe/Moscow /etc/localtime && \ - echo "Europe/Moscow" > /etc/timezone + cp /usr/share/zoneinfo/Europe/Moscow /etc/localtime && \ + echo "Europe/Moscow" > /etc/timezone ADD Gemfile Gemfile.lock /opt/app/src/ RUN bundle config without production && bundle install --retry=3 --jobs 20