scottk/chatwoot
1
0
Fork 0
mirror of https://github.com/lingble/chatwoot.git synced 2025-10-31 02:57:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump ruby from 2.7.1 to 2.7.2 (#1426)

Browse Source 
Closes:  #1399
This commit is contained in:
Adam Zysko
2020-11-20 11:08:13 +01:00
committed by GitHub
parent 29bd05ccfb
commit 61d26f71c1
13 changed files with 27 additions and 28 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: circleci/ruby:2.7.1-node-browsers - image: circleci/ruby:2.7.2-node-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

1
.env.example
View File

@@ -130,4 +130,3 @@ USE_INBOX_AVATAR_FOR_BOT=true
# if you want to use letter_opener for local emails # if you want to use letter_opener for local emails
# LETTER_OPENER=true # LETTER_OPENER=true

2
.ruby-version
View File

@@ -1 +1 @@
2.7.1 2.7.2

2
Gemfile
View File

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

2
Gemfile.lock
View File

@@ -638,7 +638,7 @@ DEPENDENCIES
wisper (= 2.0.0) wisper (= 2.0.0)
RUBY VERSION RUBY VERSION
ruby 2.7.1p83 ruby 2.7.2p137
BUNDLED WITH BUNDLED WITH
2.1.4 2.1.4

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-2.7.1/bin:/home/chatwoot/.rvm/gems/ruby-2.7.1@global/bin:/home/chatwoot/.rvm/rubies/ruby-2.7.1/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-2.7.2/bin:/home/chatwoot/.rvm/gems/ruby-2.7.2@global/bin:/home/chatwoot/.rvm/rubies/ruby-2.7.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="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-2.7.1" Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-2.7.2"
Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-2.7.1:/home/chatwoot/.rvm/gems/ruby-2.7.1@global" Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-2.7.2:/home/chatwoot/.rvm/gems/ruby-2.7.2@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-2.7.1/bin:/home/chatwoot/.rvm/gems/ruby-2.7.1@global/bin:/home/chatwoot/.rvm/rubies/ruby-2.7.1/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-2.7.2/bin:/home/chatwoot/.rvm/gems/ruby-2.7.2@global/bin:/home/chatwoot/.rvm/rubies/ruby-2.7.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="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-2.7.1" Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-2.7.2"
Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-2.7.1:/home/chatwoot/.rvm/gems/ruby-2.7.1@global" Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-2.7.2:/home/chatwoot/.rvm/gems/ruby-2.7.2@global"

4
deployment/setup_18.04.sh
View File

@@ -43,8 +43,8 @@ RAILS_ENV=production
sudo -i -u chatwoot << EOF sudo -i -u chatwoot << EOF
rvm --version rvm --version
rvm autolibs disable rvm autolibs disable
rvm install "ruby-2.7.1" rvm install "ruby-2.7.2"
rvm use 2.7.1 --default rvm use 2.7.2 --default
git clone https://github.com/chatwoot/chatwoot.git git clone https://github.com/chatwoot/chatwoot.git
cd chatwoot cd chatwoot

4
deployment/setup_20.04.sh
View File

@@ -43,8 +43,8 @@ RAILS_ENV=production
sudo -i -u chatwoot << EOF sudo -i -u chatwoot << EOF
rvm --version rvm --version
rvm autolibs disable rvm autolibs disable
rvm install "ruby-2.7.1" rvm install "ruby-2.7.2"
rvm use 2.7.1 --default rvm use 2.7.2 --default
git clone https://github.com/chatwoot/chatwoot.git git clone https://github.com/chatwoot/chatwoot.git
cd chatwoot cd chatwoot

4
docker/Dockerfile
View File

@@ -1,5 +1,5 @@
# pre-build stage # pre-build stage
FROM ruby:2.7.1-alpine AS pre-builder FROM ruby:2.7.2-alpine 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
@@ -51,7 +51,7 @@ RUN if [ "$RAILS_ENV" = "production" ]; then \
fi fi
# final build stage # final build stage
FROM ruby:2.7.1-alpine FROM ruby:2.7.2-alpine
ARG BUNDLE_WITHOUT="development:test" ARG BUNDLE_WITHOUT="development:test"
ENV BUNDLE_WITHOUT ${BUNDLE_WITHOUT} ENV BUNDLE_WITHOUT ${BUNDLE_WITHOUT}

8
docs/development/environment-setup/mac-os.md
View File

@@ -37,19 +37,19 @@ source ~/.rvm/scripts/rvm
### Install Ruby ### Install Ruby
Chatwoot APIs are built on Ruby on Rails, you need install ruby 2.7.1 Chatwoot APIs are built on Ruby on Rails, you need install ruby 2.7.2
If you are using `rvm` : If you are using `rvm` :
```bash ```bash
rvm install ruby-2.7.1 rvm install ruby-2.7.2
rvm use 2.7.1 rvm use 2.7.2
``` ```
If you are using `rbenv` to manage ruby versions do : If you are using `rbenv` to manage ruby versions do :
```bash ```bash
rbenv install 2.7.1 rbenv install 2.7.2
``` ```
`rbenv` identifies the ruby version from `.ruby-version` file on the root of the project and loads it automatically. `rbenv` identifies the ruby version from `.ruby-version` file on the root of the project and loads it automatically.

8
docs/development/environment-setup/ubuntu.md
View File

@@ -33,16 +33,16 @@ Enable `Run command as a login shell` in terminal `Preferences`. Restart your co
### Install Ruby ### Install Ruby
Chatwoot APIs are built on Ruby on Rails. You need to install ruby 2.7.1: Chatwoot APIs are built on Ruby on Rails. You need to install ruby 2.7.2:
```bash ```bash
rvm install ruby-2.7.1 rvm install ruby-2.7.2
``` ```
Use ruby 2.7.1 as default: Use ruby 2.7.2 as default:
```bash ```bash
rvm use 2.7.1 --default rvm use 2.7.2 --default
``` ```
### Install Node.js ### Install Node.js

6
docs/development/environment-setup/windows.md
View File

@@ -26,15 +26,15 @@ sudo apt-get update
sudo apt-get install git-core curl zlib1g-dev build-essential libssl-dev libreadline-dev libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt1-dev libcurl4-openssl-dev software-properties-common libffi-dev sudo apt-get install git-core curl zlib1g-dev build-essential libssl-dev libreadline-dev libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt1-dev libcurl4-openssl-dev software-properties-common libffi-dev
``` ```
Install RVM & ruby version 2.7.1 Install RVM & ruby version 2.7.2
```bash ```bash
sudo apt-get install libgdbm-dev libncurses5-dev automake libtool bison libffi-dev sudo apt-get install libgdbm-dev libncurses5-dev automake libtool bison libffi-dev
gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
curl -sSL https://get.rvm.io | bash -s stable curl -sSL https://get.rvm.io | bash -s stable
source ~/.rvm/scripts/rvm source ~/.rvm/scripts/rvm
rvm install 2.7.1 rvm install 2.7.2
rvm use 2.7.1 --default rvm use 2.7.2 --default
ruby -v ruby -v
``` ```