diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4106ceca..c77a90fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: ruby: - - 2.7 + - 3.1 postgres_image: - postgis/postgis:12-3.3 services: @@ -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' diff --git a/CHANGELOG.md b/CHANGELOG.md index 25eff0a9..48294f89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/Dockerfile b/Dockerfile index 69d50cba..ef344bac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7 +FROM ruby:3.1 LABEL maintainer="Max Burnette , Rob Kooper " # arguments that are added at the bottom of BETY @@ -34,7 +34,7 @@ RUN apt-get update \ curl \ git \ libgeos-dev \ - netcat \ + netcat-openbsd \ nodejs \ postgresql-client \ && rm -rf /var/lib/apt/lists/* \ @@ -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' \