Merge branch 'master' into schema-3-dep

.github/workflows/_update_terraform.yml

@@ -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'
@@ -51,7 +51,7 @@ jobs:
           git add test/services/mds/_poodle.auto.tfvars
           git commit -m "Adding poodle git variables for tag ${{ steps.extract_variables.outputs.GIT_TAG }}"
       - name: Push changes
-        uses: ad-m/github-push-action@v0.7.0
+        uses: ad-m/github-push-action@v0.8.0
         with:
           github_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
           repository: 'datacite/mastino'

.github/workflows/build.yml

@@ -20,29 +20,29 @@ 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
+        uses: docker/setup-buildx-action@v3
       - name: Cache Docker layers
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and Push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile

.github/workflows/ci.yml

@@ -21,12 +21,12 @@ 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'
-      - uses: actions/cache@v3
+          ruby-version: '3.1.4'
+      - uses: actions/cache@v4
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
@@ -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

.ruby-version

@@ -0,0 +1 @@
+3.2.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM phusion/passenger-full:2.1.0
+FROM phusion/passenger-full:3.0.7
 LABEL maintainer="[email protected]"
 
 # Set correct environment variables.
@@ -11,8 +11,9 @@ 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 install ruby-3.2.0' && \
+    bash -lc 'rvm --default use ruby-3.2.0'
 
 # Update installed APT packages
 RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \
@@ -44,8 +45,10 @@ RUN mkdir -p /home/app/webapp/vendor/bundle && \
 
 # Install Ruby gems
 WORKDIR /home/app/webapp
-RUN gem install bundler && \
-    /sbin/setuser app bundle install --path vendor/bundle
+RUN gem install rubygems-update -v 3.5.6 && \
+    gem install bundler:2.5.6 && \
+    su - app -c "bundle config set path 'vendor/bundle'" && \
+    su - app -c 'cd /home/app/webapp && bundle install'
 
 # Run additional scripts during container startup (i.e. not at build time)
 WORKDIR /home/app/webapp

Gemfile

@@ -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.3.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"
@@ -26,6 +26,8 @@ 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'
+gem 'base64', '~> 0.2.0'
 
 group :development, :test do
   gem "better_errors"
@@ -37,7 +39,7 @@ group :development, :test do
 end
 
 group :development do
-  gem "listen", "~> 3.0.5"
+  gem "listen", "~> 3.7.1"
   gem "spring"
   gem "spring-watcher-listen", "~> 2.0.0"
   # gem "httplog", "~> 1.0"