-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'rails-upgrades' into develop: 2024 Q1 Rails Upgrade
#974 Upgrades: - Rails 4.0 to 6.1 - Ruby 2.3 to 3.0 - Many other dependencies, and associated fixes - See notes in #969 for most of the changes - Also includes feature change to checklist #972
- Loading branch information
Showing
1,153 changed files
with
171,008 additions
and
7,552 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
# See https://git-scm.com/docs/gitattributes for more about git attribute files. | ||
|
||
# Mark the database schema as having been generated. | ||
db/schema.rb linguist-generated | ||
|
||
# Mark the yarn lockfile as having been generated. | ||
yarn.lock linguist-generated | ||
|
||
# Mark any vendored files as having been vendored. | ||
vendor/* linguist-vendored |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.3.1 | ||
3.0.6 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
# Dockerfile | ||
FROM ruby:3.0.6 | ||
|
||
ENV DEBIAN_FRONTEND=noninteractive | ||
# Rails and SAPI has some additional dependencies, e.g. rake requires a JS | ||
# runtime, so attempt to get these from apt, where possible | ||
RUN apt-get update && apt-get install -y --force-yes \ | ||
# For ruby? | ||
libsodium-dev libgmp3-dev \ | ||
# For RVM | ||
gnupg procps curl libssl-dev \ | ||
# For assets local_precompile (cap deploy) | ||
rsync nodejs \ | ||
# gems | ||
libpq-dev postgresql-client | ||
|
||
RUN mkdir /SAPI | ||
WORKDIR /SAPI | ||
|
||
# https://stackoverflow.com/questions/43612927/how-to-correctly-install-rvm-in-docker | ||
RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB | ||
RUN curl -sSL https://get.rvm.io | bash -s | ||
RUN /bin/bash -l -c ". /etc/profile.d/rvm.sh && rvm install 3.0.6" | ||
# RVM installed in multi-user mode. However cap assume rvm is installed in single user mode. | ||
# Create a soft link to fake it. | ||
RUN mkdir -p ~/.rvm/bin && ln -s /usr/local/rvm/bin/rvm ~/.rvm/bin/rvm | ||
|
||
COPY Gemfile /SAPI/Gemfile | ||
COPY Gemfile.lock /SAPI/Gemfile.lock | ||
|
||
ENV BUNDLE_SILENCE_ROOT_WARNING=1 | ||
RUN /bin/bash -c "source /etc/profile.d/rvm.sh \ | ||
&& gem install bundler:2.2.33 \ | ||
&& bundle" | ||
|
||
ENTRYPOINT ["/bin/bash", "-l"] | ||
|
||
########################################## | ||
## Run the following in container | ||
########################################## | ||
# /bin/bash --rcfile cap-deploy-shell.sh | ||
# [Enter your passphrase] | ||
# root@commit:/SAPI$ CAP_BRANCH=<branch> cap staging deploy | ||
# | ||
########################################## | ||
# Alternatively, from outside docker | ||
########################################## | ||
# docker exec -it sapi-cap-deploy /bin/bash --rcfile cap-deploy-shell.sh | ||
# [Enter your passphrase] | ||
# root@commit:/SAPI# CAP_BRANCH=<branch> cap staging deploy |
Oops, something went wrong.