diff --git a/Dockerfile b/Dockerfile index 4013a65f7..52fedcec4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM phusion/passenger-full +FROM phusion/passenger-full:2.5.1 ARG PASSENGER_APP_ENV=production @@ -9,7 +9,6 @@ ADD bonnie.conf /etc/nginx/sites-enabled/bonnie.conf COPY --chown=app:app . /home/app/bonnie -RUN bash -lc "rvm install ruby-${RUBY_VERSION} && rvm --default use ruby-${RUBY_VERSION}" RUN rm -f /etc/service/nginx/down \ && rm -f /etc/nginx/sites-enabled/default \ @@ -20,6 +19,9 @@ RUN rm -f /etc/service/nginx/down \ && apt-get install shared-mime-info -y RUN su - app -c "cd /home/app/bonnie \ + && rvm autolibs disable \ + && rvm install ruby-${RUBY_VERSION} \ + && rvm --default use ruby-${RUBY_VERSION} \ && curl -O https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem \ && gem install bundler -v 2.1.4 \ && bundle install \ diff --git a/app/assets/stylesheets/landing.less b/app/assets/stylesheets/landing.less index bd2843b5b..7a909dc5e 100644 --- a/app/assets/stylesheets/landing.less +++ b/app/assets/stylesheets/landing.less @@ -1,3 +1,17 @@ +.decommissioning-banner { + display: flex; + align-items: center; + padding: 2rem; + background-color: white; + margin-left: 13%; + margin-right: 6%; + > div { + flex-direction: column; + text-align: left; + padding-left: 30px; + } +} + .container { padding: 1em; } diff --git a/app/views/home/show.html.erb b/app/views/home/show.html.erb index 0b25aa171..8c5f37539 100644 --- a/app/views/home/show.html.erb +++ b/app/views/home/show.html.erb @@ -11,6 +11,17 @@ <%= render 'layouts/framebreaker' %> +
diff --git a/config/bonnie.yml b/config/bonnie.yml index cfffdd3e6..6c95d00e6 100644 --- a/config/bonnie.yml +++ b/config/bonnie.yml @@ -1,5 +1,5 @@ defaults: &defaults - version: 6.2.5 + version: 6.2.6 enable_logging: true enable_rationale: true check_crosswalk: false diff --git a/package-lock.json b/package-lock.json index e260176d8..48189a071 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "bonnie", - "version": "6.2.5", + "version": "6.2.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "bonnie", - "version": "6.2.5", + "version": "6.2.6", "license": "Apache-2.0", "dependencies": { "browserify": "^17.0.0", diff --git a/package.json b/package.json index 9097c28ac..c3ec4945a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bonnie", - "version": "6.2.5", + "version": "6.2.6", "description": "A tool for testing electronic clinical quality measures", "main": "index.js", "repository": "git@github.com:MeasureAuthoringTool/bonnie.git", diff --git a/public/resource/Bonnie_Release_Notes.pdf b/public/resource/Bonnie_Release_Notes.pdf index ebf1174a1..0cdf08036 100644 Binary files a/public/resource/Bonnie_Release_Notes.pdf and b/public/resource/Bonnie_Release_Notes.pdf differ