diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 590cb21..c12585f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,7 +24,7 @@ jobs: - name: Set up Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.6' + ruby-version: '3.1.4' - uses: actions/cache@v3 with: path: vendor/bundle @@ -34,7 +34,7 @@ jobs: - name: Install run: | cp .env.build .env - gem install bundler -v 2.5.6 + gem install bundler -v 2.4.20 bundle config path vendor/bundle bundle install --jobs 4 --retry 3 - name: Lint and Test diff --git a/.github/workflows/parallel_ci.yml b/.github/workflows/parallel_ci.yml index ce143ba..25d23b8 100644 --- a/.github/workflows/parallel_ci.yml +++ b/.github/workflows/parallel_ci.yml @@ -29,7 +29,7 @@ jobs: - name: Set up Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: "2.6" + ruby-version: "3.1.4" bundler-cache: true - name: Run Specs diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 82495c2..d5d581c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: - name: Set up Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.6' + ruby-version: '3.1.4' - uses: actions/cache@v3 with: path: vendor/bundle @@ -33,7 +33,7 @@ jobs: - name: Install run: | cp .env.build .env - gem install bundler -v 2.5.6 + gem install bundler -v 2.4.20 bundle config path vendor/bundle bundle install --jobs 4 --retry 3 - name: Lint and Test diff --git a/Dockerfile b/Dockerfile index d82aaec..75323ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM phusion/passenger-full:2.0.1 +FROM phusion/passenger-full:2.5.1 LABEL maintainer="kgarza@datacite.org" # Set correct environment variables. @@ -12,7 +12,7 @@ RUN usermod -a -G docker_env app CMD ["/sbin/my_init"] # Use Ruby 3.1.4 -RUN bash -lc 'rvm --default use ruby-2.6.8' +RUN bash -lc 'rvm --default use ruby-3.1.4' # Update installed APT packages RUN apt-get update && apt-get upgrade -y --allow-unauthenticated -o Dpkg::Options::="--force-confold" && \