Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency ruby to v3.2.2 - abandoned #641

Closed
wants to merge 5 commits into from
Closed

Update dependency ruby to v3.2.2 - abandoned #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8af0bbd
Update dependency ruby to v3.2.2
renovate[bot] Nov 15, 2023
40eabb1
Update dependencies for `3.2.2`
yndajas Nov 15, 2023
423b330
Fix setup script messaging
yndajas Nov 15, 2023
091029d
TESY update Node in Dockerfile
yndajas Nov 15, 2023
819e975
TEST
yndajas Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.1
3.2.2
17 changes: 10 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
# ------------------------------------------------------------------------------
# Base
# ------------------------------------------------------------------------------
FROM ruby:3.2.1 as base
FROM ruby:3.2.2 as base
LABEL org.opencontainers.image.authors="[email protected]"

RUN curl -L https://deb.nodesource.com/setup_16.x | bash -
RUN curl https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
RUN \
echo "deb https://dl.yarnpkg.com/debian/ stable main" | \
tee /etc/apt/sources.list.d/yarn.list
apt-get update && \
apt-get install -y ca-certificates curl gnupg && \
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | \
gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | \
tee /etc/apt/sources.list.d/nodesource.list && \
apt-get update && \
apt-get install nodejs -y && \
npm install --global yarn

RUN \
apt-get update && \
Expand All @@ -28,8 +33,6 @@ ENV NODE_ENV ${RAILS_ENV:-production}
# ------------------------------------------------------------------------------
FROM base AS dependencies

RUN apt-get update && apt-get install -y yarn

WORKDIR ${DEPS_HOME}

# Install Ruby dependencies
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby "3.2.1"
ruby "3.2.2"

gem "bootsnap", ">= 1.1.0", require: false
gem "bootstrap", ">= 4.3.1"
Expand Down
10 changes: 5 additions & 5 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ GEM
rack (>= 0.9.0)
bigdecimal (3.1.4)
bindex (0.8.1)
bootsnap (1.16.0)
bootsnap (1.17.0)
msgpack (~> 1.2)
bootstrap (5.2.3)
autoprefixer-rails (>= 9.1.0)
Expand Down Expand Up @@ -188,9 +188,9 @@ GEM
mini_racer (0.6.3)
libv8-node (~> 16.10.0.0)
minitest (5.20.0)
msgpack (1.6.0)
msgpack (1.7.2)
mutex_m (0.2.0)
net-imap (0.4.4)
net-imap (0.4.5)
date
net-protocol
net-pop (0.1.2)
Expand Down Expand Up @@ -323,7 +323,7 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
spring (4.1.1)
spring (4.1.2)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (4.2.0)
Expand Down Expand Up @@ -408,7 +408,7 @@ DEPENDENCIES
web-console (>= 3.3.0)

RUBY VERSION
ruby 3.2.1p31
ruby 3.2.2p53

BUNDLED WITH
2.4.7
4 changes: 2 additions & 2 deletions script/no-docker/setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ bundle exec rails db:drop
DB_DROP_RESULT=$?
set -e

if [ -z "$CI" ] && [ -n "$DB_DROP_RESULT" ]; then
if [ -z "$CI" ] && [ "$DB_DROP_RESULT" != 0 ]; then
printf "\\nDatabase drop failed. Continue anyway? [y/N] "
read -r

Expand All @@ -44,7 +44,7 @@ RAILS_ENV="test" bundle exec rails db:drop
DB_DROP_RESULT=$?
set -e

if [ -z "$CI" ] && [ -n "$DB_DROP_RESULT" ]; then
if [ -z "$CI" ] && [ "$DB_DROP_RESULT" != 0 ]; then
printf "\\nDatabase drop failed. Continue anyway? [y/N] "
read -r

Expand Down
Loading