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

switch to ruby 3.1 #758

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
ruby:
- 2.7
- 3.1
postgres_image:
- postgis/postgis:12-3.3
services:
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
sudo apt-get -y install libgeos-dev
- name: Install gems
run: |
gem install bundler -v 1.17.3
gem install bundler -v 2.3
bundle config path vendor/bundle
bundle config without 'javascript_testing'
bundle config with 'docker'
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ In this case you can simply pull down the version you want, and run `docker-comp
- **Important** Users who use the docker-compose file will need to either:
- dump the database first and then reload because this involves a database version upgrade
- switch the postgres image back to mdillon/postgis:9.5. This is not recommended because postgres v9.5 is no longer supported.

- Using ruby 3.1 as base

## [5.4.1] - 2021-10-10

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.7
FROM ruby:3.1
LABEL maintainer="Max Burnette <mburnet2@illinois.edu>, Rob Kooper <kooper@illinois.edu>"

# arguments that are added at the bottom of BETY
Expand Down Expand Up @@ -34,7 +34,7 @@ RUN apt-get update \
curl \
git \
libgeos-dev \
netcat \
netcat-openbsd \
nodejs \
postgresql-client \
&& rm -rf /var/lib/apt/lists/* \
Expand All @@ -46,7 +46,7 @@ WORKDIR /home/bety

# install gems (allowing for caching)
COPY --chown=bety /Gemfile* /home/bety/
RUN gem install bundler -v 1.17.3 \
RUN gem install bundler -v 2.3 \
&& bundle config path vendor/bundle \
&& bundle config without 'test development production debug javascript_testing' \
&& bundle config with 'docker' \
Expand Down
Loading