scottk/chatwoot
1
0
Fork 0
mirror of https://github.com/lingble/chatwoot.git synced 2025-11-01 03:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Upgrade ruby to 3.3.3 (#9664)

Browse Source 
- Upgrade the ruby version to 3.3.3

---------

Co-authored-by: Vishnu Narayanan <iamwishnu@gmail.com>
This commit is contained in:
Sojan Jose
2024-07-04 23:50:07 -07:00
committed by GitHub
parent 6ae606c981
commit 31bcdaa3dd
9 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@@ -7,7 +7,7 @@ defaults: &defaults
working_directory: ~/build working_directory: ~/build
docker: docker:
# specify the version you desire here # specify the version you desire here
- image: cimg/ruby:3.2.2-browsers - image: cimg/ruby:3.3.3-browsers
# Specify service dependencies here if necessary # Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images # CircleCI maintains a library of pre-built images

4
.devcontainer/docker-compose.yml
View File

@@ -12,7 +12,7 @@ services:
args: args:
VARIANT: "ubuntu-22.04" VARIANT: "ubuntu-22.04"
NODE_VERSION: "20.9.0" NODE_VERSION: "20.9.0"
RUBY_VERSION: "3.2.2" RUBY_VERSION: "3.3.3"
# On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000. # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
USER_UID: "1000" USER_UID: "1000"
USER_GID: "1000" USER_GID: "1000"
@@ -25,7 +25,7 @@ services:
args: args:
VARIANT: "ubuntu-22.04" VARIANT: "ubuntu-22.04"
NODE_VERSION: "20.9.0" NODE_VERSION: "20.9.0"
RUBY_VERSION: "3.2.2" RUBY_VERSION: "3.3.3"
# On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000. # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
USER_UID: "1000" USER_UID: "1000"
USER_GID: "1000" USER_GID: "1000"

2
.ruby-version
View File

@@ -1 +1 @@
3.2.2 3.3.3

2
Gemfile
View File

@@ -1,6 +1,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
ruby '3.2.2' ruby '3.3.3'
##-- base gems for rails --## ##-- base gems for rails --##
gem 'rack-cors', '2.0.0', require: 'rack/cors' gem 'rack-cors', '2.0.0', require: 'rack/cors'

31
Gemfile.lock
View File

@@ -183,13 +183,16 @@ GEM
activerecord (>= 5.a) activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0) database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1) database_cleaner-core (2.0.1)
date (3.3.4) datadog-ci (0.8.3)
ddtrace (1.11.1)
debase-ruby_core_source (>= 0.10.16, <= 3.2.0)
libdatadog (~> 2.0.0.1.0)
libddwaf (~> 1.8.2.0.0)
msgpack msgpack
debase-ruby_core_source (3.2.0) date (3.3.4)
ddtrace (1.23.2)
datadog-ci (~> 0.8.1)
debase-ruby_core_source (= 3.3.1)
libdatadog (~> 7.0.0.1.0)
libddwaf (~> 1.14.0.0.0)
msgpack
debase-ruby_core_source (3.3.1)
debug (1.8.0) debug (1.8.0)
irb (>= 1.5.0) irb (>= 1.5.0)
reline (>= 0.3.1) reline (>= 0.3.1)
@@ -416,15 +419,15 @@ GEM
addressable (~> 2.8) addressable (~> 2.8)
letter_opener (1.8.1) letter_opener (1.8.1)
launchy (>= 2.2, < 3) launchy (>= 2.2, < 3)
libdatadog (2.0.0.1.0) libdatadog (7.0.0.1.0)
libdatadog (2.0.0.1.0-x86_64-linux) libdatadog (7.0.0.1.0-x86_64-linux)
libddwaf (1.8.2.0.0) libddwaf (1.14.0.0.0)
ffi (~> 1.0) ffi (~> 1.0)
libddwaf (1.8.2.0.0-arm64-darwin) libddwaf (1.14.0.0.0-arm64-darwin)
ffi (~> 1.0) ffi (~> 1.0)
libddwaf (1.8.2.0.0-x86_64-darwin) libddwaf (1.14.0.0.0-x86_64-darwin)
ffi (~> 1.0) ffi (~> 1.0)
libddwaf (1.8.2.0.0-x86_64-linux) libddwaf (1.14.0.0.0-x86_64-linux)
ffi (~> 1.0) ffi (~> 1.0)
line-bot-api (1.28.0) line-bot-api (1.28.0)
liquid (5.4.0) liquid (5.4.0)
@@ -962,7 +965,7 @@ DEPENDENCIES
working_hours working_hours
RUBY VERSION RUBY VERSION
ruby 3.2.2p185 ruby 3.3.3p89
BUNDLED WITH BUNDLED WITH
2.4.6 2.5.14

6
deployment/chatwoot-web.1.service
View File

@@ -16,10 +16,10 @@ KillMode=mixed
StandardInput=null StandardInput=null
SyslogIdentifier=%p SyslogIdentifier=%p
Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.2.2/bin:/home/chatwoot/.rvm/gems/ruby-3.2.2@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.2.2/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin" Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.3.3/bin:/home/chatwoot/.rvm/gems/ruby-3.3.3@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.3.3/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
Environment="PORT=3000" Environment="PORT=3000"
Environment="RAILS_ENV=production" Environment="RAILS_ENV=production"
Environment="NODE_ENV=production" Environment="NODE_ENV=production"
Environment="RAILS_LOG_TO_STDOUT=true" Environment="RAILS_LOG_TO_STDOUT=true"
Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.2.2" Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.3.3"
Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.2.2:/home/chatwoot/.rvm/gems/ruby-3.2.2@global" Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.3.3:/home/chatwoot/.rvm/gems/ruby-3.3.3@global"

6
deployment/chatwoot-worker.1.service
View File

@@ -16,10 +16,10 @@ KillMode=mixed
StandardInput=null StandardInput=null
SyslogIdentifier=%p SyslogIdentifier=%p
Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.2.2/bin:/home/chatwoot/.rvm/gems/ruby-3.2.2@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.2.2/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin" Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.3.3/bin:/home/chatwoot/.rvm/gems/ruby-3.3.3@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.3.3/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
Environment="PORT=3000" Environment="PORT=3000"
Environment="RAILS_ENV=production" Environment="RAILS_ENV=production"
Environment="NODE_ENV=production" Environment="NODE_ENV=production"
Environment="RAILS_LOG_TO_STDOUT=true" Environment="RAILS_LOG_TO_STDOUT=true"
Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.2.2" Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.3.3"
Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.2.2:/home/chatwoot/.rvm/gems/ruby-3.2.2@global" Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.3.3:/home/chatwoot/.rvm/gems/ruby-3.3.3@global"

4
deployment/setup_20.04.sh
View File

@@ -336,8 +336,8 @@ function setup_chatwoot() {
sudo -i -u chatwoot << EOF sudo -i -u chatwoot << EOF
rvm --version rvm --version
rvm autolibs disable rvm autolibs disable
rvm install "ruby-3.2.2" rvm install "ruby-3.3.3"
rvm use 3.2.2 --default rvm use 3.3.3 --default
git clone https://github.com/chatwoot/chatwoot.git git clone https://github.com/chatwoot/chatwoot.git
cd chatwoot cd chatwoot

10
docker/Dockerfile
View File

@@ -1,5 +1,5 @@
# pre-build stage # pre-build stage
FROM ruby:3.2.2-alpine3.18 AS pre-builder FROM ruby:3.3.3-alpine3.19 AS pre-builder
# ARG default to production settings # ARG default to production settings
# For development docker-compose file overrides ARGS # For development docker-compose file overrides ARGS
@@ -25,7 +25,7 @@ RUN apk update && apk add --no-cache \
tzdata \ tzdata \
postgresql-dev \ postgresql-dev \
postgresql-client \ postgresql-client \
nodejs-current \ nodejs=20.12.1-r0 \
yarn \ yarn \
git \ git \
&& mkdir -p /var/app \ && mkdir -p /var/app \
@@ -67,13 +67,13 @@ RUN if [ "$RAILS_ENV" = "production" ]; then \
RUN git rev-parse HEAD > /app/.git_sha RUN git rev-parse HEAD > /app/.git_sha
# Remove unnecessary files # Remove unnecessary files
RUN rm -rf /gems/ruby/3.2.0/cache/*.gem \ RUN rm -rf /gems/ruby/3.3.0/cache/*.gem \
&& find /gems/ruby/3.2.0/gems/ \( -name "*.c" -o -name "*.o" \) -delete \ && find /gems/ruby/3.3.0/gems/ \( -name "*.c" -o -name "*.o" \) -delete \
&& rm -rf .git \ && rm -rf .git \
&& rm .gitignore && rm .gitignore
# final build stage # final build stage
FROM ruby:3.2.2-alpine3.18 FROM ruby:3.3.3-alpine3.19
ARG BUNDLE_WITHOUT="development:test" ARG BUNDLE_WITHOUT="development:test"