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.

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

Updated bolognese version #67

Closed
wants to merge 12 commits into from
2 changes: 1 addition & 1 deletion .github/workflows/_update_terraform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
GIT_TAG: ${{ inputs.image_tag }}
steps:
- name: Checkout terraform config repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# public repo with terraform configuration
repository: 'datacite/mastino'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Cache Docker layers
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ jobs:
MDS_USERNAME: ${{ secrets.MDS_USERNAME }}
MDS_PASSWORD: ${{ secrets.MDS_PASSWORD }}
steps:
- uses: actions/checkout@v3
- name: Set up Ruby 2.6
- uses: actions/checkout@v4
- name: Set up Ruby 3.1.4
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.6.9'
ruby-version: '3.1.4'
- uses: actions/cache@v3
with:
path: vendor/bundle
Expand All @@ -36,7 +36,7 @@ jobs:
env:
MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
run: |
gem install bundler
gem install bundler:2.5.6
bundle config path vendor/bundle
bundle install --jobs 4 --retry 3
- name: (Lint and) Test
Expand Down
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.1.4
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM phusion/passenger-full:2.1.0
FROM phusion/passenger-full:2.5.1
LABEL maintainer="[email protected]"

# Set correct environment variables.
Expand All @@ -11,8 +11,8 @@ RUN usermod -a -G docker_env app
# Use baseimage-docker's init process.
CMD ["/sbin/my_init"]

# Use Ruby 2.6.9
RUN bash -lc 'rvm --default use ruby-2.6.9'
# Use Ruby 3.1.4
RUN bash -lc 'rvm --default use ruby-3.1.4'

# Update installed APT packages
RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \
Expand Down Expand Up @@ -44,7 +44,8 @@ RUN mkdir -p /home/app/webapp/vendor/bundle && \

# Install Ruby gems
WORKDIR /home/app/webapp
RUN gem install bundler && \
RUN gem install rubygems-update -v 3.5.6 && \
gem install bundler:2.5.6 && \
/sbin/setuser app bundle install --path vendor/bundle

# Run additional scripts during container startup (i.e. not at build time)
Expand Down
13 changes: 7 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@

source "https://rubygems.org"

gem "rails", "~> 5.2"
gem "rails", "~> 7.1", ">= 7.1.3"
gem "dotenv"
gem "oj", ">= 2.8.3"
gem "oj_mimic_json", "~> 1.0", ">= 1.0.1"
gem "equivalent-xml", "~> 0.6.0"
gem "nokogiri", ">= 1.10.4"
gem "iso8601", "~> 0.9.0"
gem "bolognese", "~> 2.0.3"
gem "maremma", "~> 4.9.8"
gem "faraday", "~> 0.17.6"
gem "bolognese", "~> 2.2"
gem "maremma", ">= 4.9.8"
gem "faraday", ">= 2.0", "< 3.0.0"
gem "base32-url", "~> 0.5"
gem "dalli", "~> 2.7.6"
gem "dalli", "~> 3.2", ">= 3.2.8"
gem "lograge", "~> 0.11.2"
gem "logstash-event", "~> 1.2", ">= 1.2.02"
gem "logstash-logger", "~> 0.26.1"
gem "sentry-raven", "~> 2.9"
gem "sentry-raven", "~> 3.1", ">= 3.1.2"
gem "jwt", "~> 1.5", ">= 1.5.4"
gem "cancancan", "~> 2.0"
gem "tzinfo-data", "~> 1.2017", ">= 1.2017.3"
Expand All @@ -26,6 +26,7 @@ gem "rack-cors", "~> 1.0", require: "rack/cors"
gem "rack-utf8_sanitizer", "~> 1.6"
gem "git", "~> 1.5"
gem "sprockets", "~> 3.7", ">= 3.7.2"
gem 'next_rails'

group :development, :test do
gem "better_errors"
Expand Down
Loading
Loading