Merge pull request #720 from PecanProject/release/5.3.1

release 5.3.1

Author: robkooper

.dockerignore

@@ -4,3 +4,4 @@ log/*
 tmp/*
 public/maps/*
 vendor
+initdb/db.dump

.github/pull.yml

@@ -0,0 +1,8 @@
+version: "1"
+rules:
+  - base: master
+    upstream: pecanproject:master
+    mergeMethod: none
+  - base: develop
+    upstream: pecanproject:develop
+    mergeMethod: none

.github/workflows/ci.yml

@@ -18,7 +18,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby: 
-          - 2.4
           - 2.5
           - 2.6
           # - 2.7 is not supported, results in error

.github/workflows/dbdump.yml

@@ -1,6 +1,11 @@
 name: DB Dump
 
 on:
+  push:
+    branches:
+      - master
+      - develop
+
   schedule:
     - cron: '0 0 * * *'
 
@@ -39,10 +44,12 @@ jobs:
         run: script/load.bety.sh -a "postgres" -p "-h localhost" -d "bety" -o bety -m 99 -r 2 -w ftp://anon:anon@ftp.test.bnl.gov/outgoing/betydb/bety.tar.gz
 
       - name: Sync with Wisconsin
-        run: script/load.bety.sh -a "postgres" -p "-h localhost" -d "bety" -o bety -m 99 -r 5 -w http://tree.aos.wisc.edu:6480/sync/dump/bety.tar.gz
+        run: script/load.bety.sh -a "postgres" -p "-h localhost" -d "bety" -o bety -m 99 -r 5 -w http://fen.aos.wisc.edu:6480/sync/dump/bety.tar.gz
 
       - name: Dump Database
-        run: pg_dump -h localhost -U postgres -F c bety > initdb/db.dump
+        run: |
+          PG=$(docker ps | awk '/postgis/ { print $1 }')
+          docker exec ${PG} pg_dump -h localhost -U postgres -F c bety > initdb/db.dump
 
       - name: Build Docker with Database dump
         run: |

.gitignore

@@ -1,5 +1,6 @@
 .idea/
 .bundle/
+.gem/
 .yardoc/
 vendor/bundle
 log
@@ -20,8 +21,12 @@ config/initializers/site_keys.rb
 .Rproj.user
 public/assets
 
+.env
 docker-compose.override.yml
 docker-compose.override.yaml
 
 # Ignore encrypted secrets key file.
 config/secrets.yml.key
+
+# Ignore db dump
+initdb/db.dump

.ruby-version

@@ -1 +1 @@
-ruby-2.3.8
+ruby-2.5.9

CHANGELOG.md

@@ -17,7 +17,25 @@ You will need to install the latest version of BETY (or the version you want to
 
 In this case you can simply pull down the version you want, and run `docker-compose bety migrate`.
 
-## [Unreleased]
+## [5.3.1] - 2021-10-07
+
+### Added
+- configuration to sync forks of BETY using https://github.com/wei/pull
+- configuration to set root_url
+
+### Fixes
+- Fixes to the docker build to fit in kubernetes helm chart.
+- Added Wisconsin back to database dump workflow
+- Catch exception when load.bety fails and cleans up /tmp folder
+- Fix problem with sendmail causing error on new user sign up https://github.com/PecanProject/bety/issues/677
+
+### Changed
+
+- [#705](https://github.com/PecanProject/bety/pull/705) : More clearly indicate method is optional in bulk upload
+- updated rails to 5.2.4.5
+- removed static route, it was only used to render 404.
+- allow n=1 in bulk upload https://github.com/PecanProject/bety/pull/704
+
 
 ## [5.3.0] - 2020-04-15
 

Dockerfile

@@ -1,36 +1,5 @@
-FROM ruby:2.3
-MAINTAINER Max Burnette <mburnet2@illinois.edu>
-
-# Install dependencies
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        curl \
-        git \
-        libgeos-dev \
-        netcat \
-        nodejs \
-        postgresql-client \
-    && rm -rf /var/lib/apt/lists/*
-
-# change to working directory
-WORKDIR /home/bety
-
-# install gems (allowing for caching)
-COPY /Gemfile* /home/bety/
-RUN gem install bundler \
-    && bundle install --with docker --without "test development production debug javascript_testing"
-
-
-# port that is exposed (standard ruby port)
-EXPOSE 8000
-
-# copy rest of the files
-COPY / /home/bety
-COPY /docker/database.yml /home/bety/config/database.yml
-COPY /docker/config.ru /home/bety/config.ru
-
-# configure app
-RUN /bin/sed -e '/serve_static_assets/ s/false$/true/' -i config/environments/production.rb
+FROM ruby:2.6
+LABEL maintainer="Max Burnette <mburnet2@illinois.edu>, Rob Kooper <kooper@illinois.edu>"
 
 # arguments that are added at the bottom of BETY
 ARG BETY_GIT_TAGS="unknown"
@@ -51,10 +20,51 @@ ENV LOCAL_SERVER=99 \
     BETY_GIT_TAGS=${BETY_GIT_TAGS} \
     BETY_GIT_BRANCH=${BETY_GIT_BRANCH} \
     BETY_GIT_CHECKSUM=${BETY_GIT_CHECKSUM} \
-    BETY_GIT_DATE=${BETY_GIT_DATE}
+    BETY_GIT_DATE=${BETY_GIT_DATE} \
+    PGHOST=postgres \
+    PGUSER=postgres \
+    PGDATABASE=postgres \
+    BETYUSER=bety \
+    BETYPASSWORD=bety \
+    BETYDATABASE=bety
+
+# Install dependencies
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+        curl \
+        git \
+        libgeos-dev \
+        netcat \
+        nodejs \
+        postgresql-client \
+    && rm -rf /var/lib/apt/lists/* \
+    && useradd -m -u 1000 -s /bin/bash bety
+
+# change to working directory
+USER bety
+WORKDIR /home/bety
+
+# install gems (allowing for caching)
+COPY --chown=bety /Gemfile* /home/bety/
+RUN gem install bundler -v 1.17.3 \
+    && bundle config path vendor/bundle \
+    && bundle config without 'test development production debug javascript_testing' \
+    && bundle config with 'docker' \
+    && bundle install --jobs 4 --retry 3
+
+# copy rest of the files
+COPY --chown=bety / /home/bety
+COPY --chown=bety /docker/database.yml /home/bety/config/database.yml
+COPY --chown=bety /docker/config.ru /home/bety/config.ru
+
+# configure app
+RUN /bin/sed -e '/serve_static_assets/ s/false$/true/' -i config/environments/production.rb
 
 # expose public files
-VOLUME ["/home/bety/public"]
+VOLUME ["/home/bety/log"]
+
+# port that is exposed
+EXPOSE 8000
 
 # default command to run bety web-app
 ENTRYPOINT ["/home/bety/docker/entrypoint.sh"]

Gemfile

@@ -1,14 +1,14 @@
 source "http://rubygems.org"
 
-gem "rails", "5.1.5"
+gem "rails", "5.2.4.5"
 # needed for rails 3.1 and above until we phase out prototype:
 ## gem 'prototype-rails', github: 'rails/prototype-rails', branch: '4.2' # see https://github.com/rails/prototype-rails/issues/37
 gem "nokogiri"
 gem "narray", "0.6.0.4"
 gem "choice", "0.1.6"
 gem "comma", "~> 4.3.2"
 gem "json"
-gem "rgeo", "~> 0.5.0"
+gem "rgeo"
 gem "multi_json"
 gem "railroad", "0.5.0"
 gem "recaptcha", "4.8.0", :require => "recaptcha/rails"
@@ -45,7 +45,7 @@ gem "pg"
 gem "activerecord-postgis-adapter"
 
 
-gem "trollop" # for Rails scripts
+gem "optimist" # for Rails scripts
 
 
 group :development, :test do
@@ -56,11 +56,6 @@ group :development, :test do
   gem "yard"
 end
 
-group :development, :test do
-  gem "pry-rails"
-  gem "pry-byebug"
-end
-
 group :test do
   # phasing out webrat:    
   # gem "webrat", "0.7.1"
@@ -83,6 +78,8 @@ end
 group :debug do
   gem "selenium-webdriver"
   gem "pry"
+  gem "pry-rails"
+  gem "pry-byebug"
 end
 
 group :production do